From ae60e38cc7eb3bafd208883f771b03339676b393 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Mon, 11 Dec 2017 20:15:05 +0000
Subject: [PATCH] Install git-ssb with scuttlebot
---
src/freedombone-app-scuttlebot | 9 ++++++++-
src/freedombone-image-customise | 3 ++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/freedombone-app-scuttlebot b/src/freedombone-app-scuttlebot
index 85e58e60c..cdfe64408 100755
--- a/src/freedombone-app-scuttlebot
+++ b/src/freedombone-app-scuttlebot
@@ -197,9 +197,13 @@ function remove_scuttlebot {
}
function mesh_install_scuttlebot {
+ get_npm_arch
+
cat <<EOF > $rootdir/usr/bin/install_scuttlebot
#!/bin/bash
-npm install -g scuttlebot@${SCUTTLEBOT_VERSION}
+npm install --arch=$NPM_ARCH -g scuttlebot@${SCUTTLEBOT_VERSION}
+npm install --arch=$NPM_ARCH -g git-ssb
+npm install --arch=$NPM_ARCH -g git-remote-ssb
EOF
chroot "$rootdir" /bin/chmod +x /usr/bin/install_scuttlebot
chroot "$rootdir" /usr/bin/install_scuttlebot
@@ -245,6 +249,9 @@ function install_scuttlebot {
exit 528253
fi
+ npm install -g git-ssb
+ npm install -g git-remote-ssb
+
if [ ! -d /etc/scuttlebot ]; then
mkdir -p /etc/scuttlebot
fi
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index c745299f7..b0fb78688 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -588,7 +588,8 @@ cd /etc/patchwork
npm install --arch=$NPM_ARCH --build-from-source
npm install --arch=$NPM_ARCH --save-dev electron-rebuild
./node_modules/.bin/electron-rebuild
-npm install --arch=$NPM_ARCH git-ssb
+npm install --arch=$NPM_ARCH -g git-ssb --registry=http://localhost:8043/
+#npm install --arch=$NPM_ARCH git-ssb
EOF
chroot "$rootdir" /bin/chmod +x /usr/bin/install_patchwork
chroot "$rootdir" /usr/bin/install_patchwork
--
GitLab