Browse Source

Install git-ssb with scuttlebot

Bob Mottram 7 years ago
parent
commit
ae60e38cc7
2 changed files with 10 additions and 2 deletions
  1. 8
    1
      src/freedombone-app-scuttlebot
  2. 2
    1
      src/freedombone-image-customise

+ 8
- 1
src/freedombone-app-scuttlebot View File

197
 }
197
 }
198
 
198
 
199
 function mesh_install_scuttlebot {
199
 function mesh_install_scuttlebot {
200
+    get_npm_arch
201
+
200
     cat <<EOF > $rootdir/usr/bin/install_scuttlebot
202
     cat <<EOF > $rootdir/usr/bin/install_scuttlebot
201
 #!/bin/bash
203
 #!/bin/bash
202
-npm install -g scuttlebot@${SCUTTLEBOT_VERSION}
204
+npm install --arch=$NPM_ARCH -g scuttlebot@${SCUTTLEBOT_VERSION}
205
+npm install --arch=$NPM_ARCH -g git-ssb
206
+npm install --arch=$NPM_ARCH -g git-remote-ssb
203
 EOF
207
 EOF
204
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_scuttlebot
208
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_scuttlebot
205
     chroot "$rootdir" /usr/bin/install_scuttlebot
209
     chroot "$rootdir" /usr/bin/install_scuttlebot
245
         exit 528253
249
         exit 528253
246
     fi
250
     fi
247
 
251
 
252
+    npm install -g git-ssb
253
+    npm install -g git-remote-ssb
254
+
248
     if [ ! -d /etc/scuttlebot ]; then
255
     if [ ! -d /etc/scuttlebot ]; then
249
         mkdir -p /etc/scuttlebot
256
         mkdir -p /etc/scuttlebot
250
     fi
257
     fi

+ 2
- 1
src/freedombone-image-customise View File

588
 npm install --arch=$NPM_ARCH --build-from-source
588
 npm install --arch=$NPM_ARCH --build-from-source
589
 npm install --arch=$NPM_ARCH --save-dev electron-rebuild
589
 npm install --arch=$NPM_ARCH --save-dev electron-rebuild
590
 ./node_modules/.bin/electron-rebuild
590
 ./node_modules/.bin/electron-rebuild
591
-npm install --arch=$NPM_ARCH git-ssb
591
+npm install --arch=$NPM_ARCH -g git-ssb --registry=http://localhost:8043/
592
+#npm install --arch=$NPM_ARCH git-ssb
592
 EOF
593
 EOF
593
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_patchwork
594
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_patchwork
594
     chroot "$rootdir" /usr/bin/install_patchwork
595
     chroot "$rootdir" /usr/bin/install_patchwork