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

src/freedombone-app-scuttlebot

@@ -372,50 +372,14 @@ function mesh_install_dat {
     cat <<EOF > "$rootdir/usr/bin/install_dat"
 #!/bin/bash
 npm install --arch=$NPM_ARCH -g dat
-npm install --arch=$NPM_ARCH -g @garbados/dat-boi
 EOF
     chroot "$rootdir" /bin/chmod +x /usr/bin/install_dat
     chroot "$rootdir" /usr/bin/install_dat
     rm "$rootdir/usr/bin/install_dat"
-
-    { echo '[Unit]';
-      echo 'Description=DAT-boi';
-      echo 'After=syslog.target';
-      echo 'After=network.target';
-      echo '';
-      echo '[Service]';
-      echo 'Type=simple';
-      echo 'User=root';
-      echo 'Group=root';
-      echo 'ExecStart=/usr/local/bin/dat-boi';
-      echo 'Restart=always';
-      echo '';
-      echo '[Install]';
-      echo 'WantedBy=multi-user.target'; } > "$rootdir/etc/systemd/system/dat-boi.service"
-    chmod +x "$rootdir/etc/systemd/system/dat-boi.service"
-    chroot "$rootdir" systemctl enable dat-boi
 }
 
 function install_dat {
     npm install -g dat
-    npm install -g @garbados/dat-boi
-
-    { echo '[Unit]';
-      echo 'Description=DAT-boi';
-      echo 'After=syslog.target';
-      echo 'After=network.target';
-      echo '';
-      echo '[Service]';
-      echo 'Type=simple';
-      echo 'User=root';
-      echo 'Group=root';
-      echo 'ExecStart=/usr/local/bin/dat-boi';
-      echo 'Restart=always';
-      echo '';
-      echo '[Install]';
-      echo 'WantedBy=multi-user.target'; } > /etc/systemd/system/dat-boi.service
-    chmod +x /etc/systemd/system/dat-boi.service
-    systemctl enable dat-boi
 }
 
 function mesh_install_scuttlebot {

src/freedombone-image-mesh

@@ -842,12 +842,12 @@ function show_desktop_icons {
       echo 'Categories=Application'; } > "/home/$MY_USERNAME/Desktop/routing.desktop"
 
     # set permissions
-    chmod +x "/home/$MY_USERNAME/Desktop/*.desktop"
+    chmod +x /home/$MY_USERNAME/Desktop/*.desktop
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/Desktop/"*
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config"
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/tox"
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/autostart"
-    chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/*.sh"
+    chown "${MY_USERNAME}":"${MY_USERNAME}" /home/$MY_USERNAME/*.sh
 
     # link to Tahoe-LAFS Magic folder
     #ln -s /home/${MY_USERNAME}/Desktop/${TAHOELAFS_SHARED_DIR} /home/${MY_USERNAME}/${TAHOELAFS_SHARED_DIR}