Преглед изворни кода

Merge branch 'stretch' of https://github.com/bashrc/freedombone

Bob Mottram пре 7 година
родитељ
комит
c991935063
2 измењених фајлова са 2 додато и 38 уклоњено
  1. 0
    36
      src/freedombone-app-scuttlebot
  2. 2
    2
      src/freedombone-image-mesh

+ 0
- 36
src/freedombone-app-scuttlebot Прегледај датотеку

372
     cat <<EOF > "$rootdir/usr/bin/install_dat"
372
     cat <<EOF > "$rootdir/usr/bin/install_dat"
373
 #!/bin/bash
373
 #!/bin/bash
374
 npm install --arch=$NPM_ARCH -g dat
374
 npm install --arch=$NPM_ARCH -g dat
375
-npm install --arch=$NPM_ARCH -g @garbados/dat-boi
376
 EOF
375
 EOF
377
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_dat
376
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_dat
378
     chroot "$rootdir" /usr/bin/install_dat
377
     chroot "$rootdir" /usr/bin/install_dat
379
     rm "$rootdir/usr/bin/install_dat"
378
     rm "$rootdir/usr/bin/install_dat"
380
-
381
-    { echo '[Unit]';
382
-      echo 'Description=DAT-boi';
383
-      echo 'After=syslog.target';
384
-      echo 'After=network.target';
385
-      echo '';
386
-      echo '[Service]';
387
-      echo 'Type=simple';
388
-      echo 'User=root';
389
-      echo 'Group=root';
390
-      echo 'ExecStart=/usr/local/bin/dat-boi';
391
-      echo 'Restart=always';
392
-      echo '';
393
-      echo '[Install]';
394
-      echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/dat-boi.service"
395
-    chmod +x "$rootdir/etc/systemd/system/dat-boi.service"
396
-    chroot "$rootdir" systemctl enable dat-boi
397
 }
379
 }
398
 
380
 
399
 function install_dat {
381
 function install_dat {
400
     npm install -g dat
382
     npm install -g dat
401
-    npm install -g @garbados/dat-boi
402
-
403
-    { echo '[Unit]';
404
-      echo 'Description=DAT-boi';
405
-      echo 'After=syslog.target';
406
-      echo 'After=network.target';
407
-      echo '';
408
-      echo '[Service]';
409
-      echo 'Type=simple';
410
-      echo 'User=root';
411
-      echo 'Group=root';
412
-      echo 'ExecStart=/usr/local/bin/dat-boi';
413
-      echo 'Restart=always';
414
-      echo '';
415
-      echo '[Install]';
416
-      echo 'WantedBy=multi-user.target'; } > /etc/systemd/system/dat-boi.service
417
-    chmod +x /etc/systemd/system/dat-boi.service
418
-    systemctl enable dat-boi
419
 }
383
 }
420
 
384
 
421
 function mesh_install_scuttlebot {
385
 function mesh_install_scuttlebot {

+ 2
- 2
src/freedombone-image-mesh Прегледај датотеку

842
       echo 'Categories=Application'; } > "/home/$MY_USERNAME/Desktop/routing.desktop"
842
       echo 'Categories=Application'; } > "/home/$MY_USERNAME/Desktop/routing.desktop"
843
 
843
 
844
     # set permissions
844
     # set permissions
845
-    chmod +x "/home/$MY_USERNAME/Desktop/*.desktop"
845
+    chmod +x /home/$MY_USERNAME/Desktop/*.desktop
846
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/Desktop/"*
846
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/Desktop/"*
847
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config"
847
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config"
848
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/tox"
848
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/tox"
849
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/autostart"
849
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/autostart"
850
-    chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/*.sh"
850
+    chown "${MY_USERNAME}":"${MY_USERNAME}" /home/$MY_USERNAME/*.sh
851
 
851
 
852
     # link to Tahoe-LAFS Magic folder
852
     # link to Tahoe-LAFS Magic folder
853
     #ln -s /home/${MY_USERNAME}/Desktop/${TAHOELAFS_SHARED_DIR} /home/${MY_USERNAME}/${TAHOELAFS_SHARED_DIR}
853
     #ln -s /home/${MY_USERNAME}/Desktop/${TAHOELAFS_SHARED_DIR} /home/${MY_USERNAME}/${TAHOELAFS_SHARED_DIR}