Browse Source

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

Bob Mottram 7 years ago
parent
commit
3efe97a70f
56 changed files with 219 additions and 162 deletions
  1. 8
    4
      src/freedombone-addcert
  2. 1
    1
      src/freedombone-adduser
  3. 4
    4
      src/freedombone-app-dokuwiki
  4. 2
    2
      src/freedombone-app-emacs
  5. 2
    1
      src/freedombone-app-etherpad
  6. 4
    3
      src/freedombone-app-friendica
  7. 5
    5
      src/freedombone-app-ghost
  8. 6
    5
      src/freedombone-app-gnusocial
  9. 11
    8
      src/freedombone-app-gogs
  10. 14
    8
      src/freedombone-app-htmly
  11. 3
    3
      src/freedombone-app-hubzilla
  12. 4
    3
      src/freedombone-app-icecast
  13. 4
    4
      src/freedombone-app-ipfs
  14. 2
    2
      src/freedombone-app-kanboard
  15. 4
    3
      src/freedombone-app-koel
  16. 3
    2
      src/freedombone-app-matrix
  17. 2
    2
      src/freedombone-app-mediagoblin
  18. 2
    1
      src/freedombone-app-nextcloud
  19. 2
    1
      src/freedombone-app-pelican
  20. 1
    1
      src/freedombone-app-pihole
  21. 1
    1
      src/freedombone-app-pleroma
  22. 6
    5
      src/freedombone-app-postactiv
  23. 4
    4
      src/freedombone-app-privatebin
  24. 1
    1
      src/freedombone-app-riot
  25. 2
    2
      src/freedombone-app-syncthing
  26. 2
    1
      src/freedombone-app-tahoelafs
  27. 2
    2
      src/freedombone-app-tox
  28. 4
    4
      src/freedombone-app-vim
  29. 3
    3
      src/freedombone-app-xmpp
  30. 3
    3
      src/freedombone-app-zeronet
  31. 1
    1
      src/freedombone-backup-remote
  32. 2
    2
      src/freedombone-base-email
  33. 2
    1
      src/freedombone-client
  34. 6
    3
      src/freedombone-clientcert
  35. 5
    3
      src/freedombone-controlpanel
  36. 7
    4
      src/freedombone-image
  37. 3
    2
      src/freedombone-image-customise
  38. 3
    3
      src/freedombone-image-hardware-setup
  39. 3
    2
      src/freedombone-image-make
  40. 1
    1
      src/freedombone-image-mesh
  41. 2
    1
      src/freedombone-mesh-blog
  42. 1
    1
      src/freedombone-pass
  43. 1
    1
      src/freedombone-recoverkey
  44. 5
    4
      src/freedombone-restore-local
  45. 4
    3
      src/freedombone-restore-remote
  46. 2
    2
      src/freedombone-rmuser
  47. 1
    1
      src/freedombone-upgrade
  48. 16
    14
      src/freedombone-utils-backup
  49. 16
    10
      src/freedombone-utils-gnusocialtools
  50. 12
    2
      src/freedombone-utils-go
  51. 1
    1
      src/freedombone-utils-gpg
  52. 5
    5
      src/freedombone-utils-keys
  53. 2
    1
      src/freedombone-utils-meteor
  54. 2
    2
      src/freedombone-utils-onion
  55. 2
    1
      src/freedombone-utils-rng
  56. 2
    2
      src/freedombone-utils-web

+ 8
- 4
src/freedombone-addcert View File

245
 
245
 
246
     # replace some legacy filenames
246
     # replace some legacy filenames
247
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.bundle.crt" ]; then
247
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.bundle.crt" ]; then
248
-        mv "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.bundle.crt" "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem"
248
+        # shellcheck disable=SC2086
249
+        mv /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.bundle.crt /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem
249
     fi
250
     fi
250
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.crt" ]; then
251
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.crt" ]; then
251
-        mv "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.crt" "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem"
252
+        # shellcheck disable=SC2086
253
+        mv /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.crt /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem
252
     fi
254
     fi
253
     sed -i "s|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.bundle.crt|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem|g" "/etc/nginx/sites-available/$LETSENCRYPT_HOSTNAME"
255
     sed -i "s|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.bundle.crt|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem|g" "/etc/nginx/sites-available/$LETSENCRYPT_HOSTNAME"
254
     sed -i "s|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.crt|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem|g" "/etc/nginx/sites-available/$LETSENCRYPT_HOSTNAME"
256
     sed -i "s|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.crt|ssl_certificate /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem|g" "/etc/nginx/sites-available/$LETSENCRYPT_HOSTNAME"
256
     # link the private key
258
     # link the private key
257
     if [ -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key" ]; then
259
     if [ -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key" ]; then
258
         if [ ! -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key.old" ]; then
260
         if [ ! -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key.old" ]; then
259
-            mv "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key" "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key.old"
261
+            # shellcheck disable=SC2086
262
+            mv /etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key /etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key.old
260
         else
263
         else
261
             rm -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key"
264
             rm -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key"
262
         fi
265
         fi
269
     # link the public key
272
     # link the public key
270
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem" ]; then
273
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem" ]; then
271
         if [ ! -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem.old" ]; then
274
         if [ ! -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem.old" ]; then
272
-            mv "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem" "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem.old"
275
+            # shellcheck disable=SC2086
276
+            mv /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem /etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem.old
273
         else
277
         else
274
             rm -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem"
278
             rm -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem"
275
         fi
279
         fi

+ 1
- 1
src/freedombone-adduser View File

132
 
132
 
133
 chown -R "$ADD_USERNAME":"$ADD_USERNAME" "/home/$ADD_USERNAME/.gnupg"
133
 chown -R "$ADD_USERNAME":"$ADD_USERNAME" "/home/$ADD_USERNAME/.gnupg"
134
 chmod 700 "/home/$ADD_USERNAME/.gnupg"
134
 chmod 700 "/home/$ADD_USERNAME/.gnupg"
135
-chmod 600 "/home/$ADD_USERNAME/.gnupg/*"
135
+chmod 600 "/home/$ADD_USERNAME/.gnupg/"*
136
 
136
 
137
 # Generate a GPG key
137
 # Generate a GPG key
138
 { echo 'Key-Type: eddsa';
138
 { echo 'Key-Type: eddsa';

+ 4
- 4
src/freedombone-app-dokuwiki View File

154
     function_check restore_directory_from_usb
154
     function_check restore_directory_from_usb
155
     restore_directory_from_usb ${temp_restore_dir} dokuwikidat
155
     restore_directory_from_usb ${temp_restore_dir} dokuwikidat
156
     if [ -d "${temp_restore_dir}/var/www/${DOKUWIKI_DOMAIN_NAME}/htdocs/data" ]; then
156
     if [ -d "${temp_restore_dir}/var/www/${DOKUWIKI_DOMAIN_NAME}/htdocs/data" ]; then
157
-        cp -r "${temp_restore_dir}/var/www/${DOKUWIKI_DOMAIN_NAME}/htdocs/data/*" "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data"
157
+        cp -r "${temp_restore_dir}/var/www/${DOKUWIKI_DOMAIN_NAME}/htdocs/data/"* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data"
158
     else
158
     else
159
-        cp -r "${temp_restore_dir}/*" "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data"
159
+        cp -r "${temp_restore_dir}/"* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data"
160
     fi
160
     fi
161
     # shellcheck disable=SC2181
161
     # shellcheck disable=SC2181
162
     if [ ! "$?" = "0" ]; then
162
     if [ ! "$?" = "0" ]; then
219
         temp_restore_dir=/root/tempdokuwikidat
219
         temp_restore_dir=/root/tempdokuwikidat
220
         restore_directory_from_friend $temp_restore_dir dokuwikidat
220
         restore_directory_from_friend $temp_restore_dir dokuwikidat
221
         if [ -d "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data" ]; then
221
         if [ -d "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data" ]; then
222
-            cp -r "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/*" "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/"
222
+            cp -r "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/"* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/"
223
         else
223
         else
224
             cp -r $temp_restore_dir/* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/"
224
             cp -r $temp_restore_dir/* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/"
225
         fi
225
         fi
237
         temp_restore_dir=/root/tempdokuwikiacl
237
         temp_restore_dir=/root/tempdokuwikiacl
238
         restore_directory_from_friend $temp_restore_dir dokuwikiacl
238
         restore_directory_from_friend $temp_restore_dir dokuwikiacl
239
         if [ -d "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl" ]; then
239
         if [ -d "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl" ]; then
240
-            cp -r "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/*" "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/"
240
+            cp -r "$temp_restore_dir/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/"* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/"
241
         else
241
         else
242
             cp -r $temp_restore_dir/* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/"
242
             cp -r $temp_restore_dir/* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/"
243
         fi
243
         fi

+ 2
- 2
src/freedombone-app-emacs View File

87
                     if [ ! -d "/home/$USERNAME/.emacs.d" ]; then
87
                     if [ ! -d "/home/$USERNAME/.emacs.d" ]; then
88
                         mkdir "/home/$USERNAME/.emacs.d"
88
                         mkdir "/home/$USERNAME/.emacs.d"
89
                     fi
89
                     fi
90
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.emacs.d"
90
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.emacs.d"
91
                 fi
91
                 fi
92
                 # shellcheck disable=SC2181
92
                 # shellcheck disable=SC2181
93
                 if [ ! "$?" = "0" ]; then
93
                 if [ ! "$?" = "0" ]; then
143
                     if [ ! -d "/home/$USERNAME/.emacs.d" ]; then
143
                     if [ ! -d "/home/$USERNAME/.emacs.d" ]; then
144
                         mkdir "/home/$USERNAME/.emacs.d"
144
                         mkdir "/home/$USERNAME/.emacs.d"
145
                     fi
145
                     fi
146
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.emacs.d/*"
146
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.emacs.d/"
147
                 fi
147
                 fi
148
                 # shellcheck disable=SC2181
148
                 # shellcheck disable=SC2181
149
                 if [ ! "$?" = "0" ]; then
149
                 if [ ! "$?" = "0" ]; then

+ 2
- 1
src/freedombone-app-etherpad View File

607
     create_site_certificate "$ETHERPAD_DOMAIN_NAME" 'yes'
607
     create_site_certificate "$ETHERPAD_DOMAIN_NAME" 'yes'
608
 
608
 
609
     if [ -f "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.crt" ]; then
609
     if [ -f "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.crt" ]; then
610
-        mv "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.crt" "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem"
610
+        # shellcheck disable=SC2086
611
+        mv /etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.crt /etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem
611
     fi
612
     fi
612
     if [ -f "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem" ]; then
613
     if [ -f "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem" ]; then
613
         chown etherpad: "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem"
614
         chown etherpad: "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem"

+ 4
- 3
src/freedombone-app-friendica View File

258
             mkdir -p "$friendica_dir/store/[data]/smarty3"
258
             mkdir -p "$friendica_dir/store/[data]/smarty3"
259
         fi
259
         fi
260
         chmod 1777 "$friendica_dir/store/[data]/smarty3"
260
         chmod 1777 "$friendica_dir/store/[data]/smarty3"
261
-        chown -R www-data:www-data "$friendica_dir/*"
261
+        chown -R www-data:www-data "$friendica_dir/"*
262
         if [ -d $temp_restore_dir ]; then
262
         if [ -d $temp_restore_dir ]; then
263
             rm -rf $temp_restore_dir
263
             rm -rf $temp_restore_dir
264
         fi
264
         fi
297
             mkdir -p "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
297
             mkdir -p "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
298
         fi
298
         fi
299
         chmod 1777 "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
299
         chmod 1777 "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
300
-        chown -R www-data:www-data "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/*"
300
+        chown -R www-data:www-data "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/"*
301
     fi
301
     fi
302
     if [ -d /root/tempfriendica ]; then
302
     if [ -d /root/tempfriendica ]; then
303
         rm -rf /root/tempfriendica
303
         rm -rf /root/tempfriendica
380
         set_completion_param "friendica commit" "$FRIENDICA_COMMIT"
380
         set_completion_param "friendica commit" "$FRIENDICA_COMMIT"
381
 
381
 
382
         rm -rf "$FRIENDICA_PATH"
382
         rm -rf "$FRIENDICA_PATH"
383
-        mv friendica "$FRIENDICA_PATH"
383
+        # shellcheck disable=SC2086
384
+        mv friendica $FRIENDICA_PATH
384
 
385
 
385
         git_clone "$FRIENDICA_ADDONS_REPO" "$FRIENDICA_PATH/addon"
386
         git_clone "$FRIENDICA_ADDONS_REPO" "$FRIENDICA_PATH/addon"
386
         cd "$FRIENDICA_PATH/addon" || exit 34835685
387
         cd "$FRIENDICA_PATH/addon" || exit 34835685

+ 5
- 5
src/freedombone-app-ghost View File

260
         restore_directory_from_usb $temp_restore_dir ghostcontent
260
         restore_directory_from_usb $temp_restore_dir ghostcontent
261
         if [ -d $temp_restore_dir ]; then
261
         if [ -d $temp_restore_dir ]; then
262
             if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
262
             if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
263
-                cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content/*" "/var/www/$GHOST_DOMAIN_NAME/htdocs/content/"
263
+                cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content/"* "/var/www/$GHOST_DOMAIN_NAME/htdocs/content/"
264
             else
264
             else
265
                 if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
265
                 if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
266
                     mkdir "/var/www/$GHOST_DOMAIN_NAME/htdocs/content"
266
                     mkdir "/var/www/$GHOST_DOMAIN_NAME/htdocs/content"
276
         restore_directory_from_usb $temp_restore_dir ghostcurrent
276
         restore_directory_from_usb $temp_restore_dir ghostcurrent
277
         if [ -d $temp_restore_dir ]; then
277
         if [ -d $temp_restore_dir ]; then
278
             if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
278
             if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
279
-                cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/*" "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/"
279
+                cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/"* "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/"
280
             else
280
             else
281
                 if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
281
                 if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
282
                     mkdir -p "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content"
282
                     mkdir -p "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content"
335
     restore_directory_from_friend $temp_restore_dir ghostcontent
335
     restore_directory_from_friend $temp_restore_dir ghostcontent
336
     if [ -d $temp_restore_dir ]; then
336
     if [ -d $temp_restore_dir ]; then
337
         if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
337
         if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
338
-            cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content/*" "/var/www/$GHOST_DOMAIN_NAME/htdocs/content/"
338
+            cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/content/"* "/var/www/$GHOST_DOMAIN_NAME/htdocs/content/"
339
         else
339
         else
340
             if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
340
             if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
341
                 mkdir "/var/www/$GHOST_DOMAIN_NAME/htdocs/content"
341
                 mkdir "/var/www/$GHOST_DOMAIN_NAME/htdocs/content"
351
     restore_directory_from_friend $temp_restore_dir ghostcurrent
351
     restore_directory_from_friend $temp_restore_dir ghostcurrent
352
     if [ -d $temp_restore_dir ]; then
352
     if [ -d $temp_restore_dir ]; then
353
         if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
353
         if [ -d "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
354
-            cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/*" "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/"
354
+            cp -r "$temp_restore_dir/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/"* "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content/"
355
         else
355
         else
356
             if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
356
             if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
357
                 mkdir -p "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content"
357
                 mkdir -p "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content"
441
     yarn install --no-emoji --no-progress
441
     yarn install --no-emoji --no-progress
442
     yarn cache clean
442
     yarn cache clean
443
     adduser --system --home="/var/www/${GHOST_DOMAIN_NAME}/htdocs/" --group ghost
443
     adduser --system --home="/var/www/${GHOST_DOMAIN_NAME}/htdocs/" --group ghost
444
-    rm -rf "/var/www/$GHOST_DOMAIN_NAME/htdocs/*"
444
+    rm -rf "/var/www/$GHOST_DOMAIN_NAME/htdocs/"*
445
     printf 'y' | ghost install ${GHOST_VERSION} --user ghost --db=sqlite3 --port ${GHOST_PORT} --verbose
445
     printf 'y' | ghost install ${GHOST_VERSION} --user ghost --db=sqlite3 --port ${GHOST_PORT} --verbose
446
 
446
 
447
     if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/versions" ]; then
447
     if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/versions" ]; then

+ 6
- 5
src/freedombone-app-gnusocial View File

360
 
360
 
361
     if [ -f "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index_qvitter.php" ]; then
361
     if [ -f "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index_qvitter.php" ]; then
362
         if [ -f "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index.php" ]; then
362
         if [ -f "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index.php" ]; then
363
-            mv "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index.php" "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index_qvitter.php"
363
+            # shellcheck disable=SC2086
364
+            mv /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index.php /var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index_qvitter.php
364
         fi
365
         fi
365
     fi
366
     fi
366
 
367
 
444
                 if [ ! -d "$gnusocial_dir/static" ]; then
445
                 if [ ! -d "$gnusocial_dir/static" ]; then
445
                     mkdir "$gnusocial_dir/static"
446
                     mkdir "$gnusocial_dir/static"
446
                 fi
447
                 fi
447
-                cp -rp "$temp_restore_dir/static/*" "$gnusocial_dir/static/"
448
+                cp -rp "$temp_restore_dir/static/"* "$gnusocial_dir/static/"
448
             fi
449
             fi
449
             chown www-data:www-data "$gnusocial_dir/config.php"
450
             chown www-data:www-data "$gnusocial_dir/config.php"
450
             chown -R www-data:www-data "$gnusocial_dir/static"
451
             chown -R www-data:www-data "$gnusocial_dir/static"
459
                 if [ ! -d "$gnusocial_dir/file" ]; then
460
                 if [ ! -d "$gnusocial_dir/file" ]; then
460
                     mkdir "$gnusocial_dir/file"
461
                     mkdir "$gnusocial_dir/file"
461
                 fi
462
                 fi
462
-                cp -rp "$temp_restore_dir/*" "$gnusocial_dir/file"
463
+                cp -rp "$temp_restore_dir/"* "$gnusocial_dir/file"
463
             fi
464
             fi
464
             chown -R www-data:www-data "$gnusocial_dir/file"
465
             chown -R www-data:www-data "$gnusocial_dir/file"
465
             rm -rf "$temp_restore_dir"
466
             rm -rf "$temp_restore_dir"
540
                 if [ ! -d "$gnusocial_dir/static" ]; then
541
                 if [ ! -d "$gnusocial_dir/static" ]; then
541
                     mkdir "$gnusocial_dir/static"
542
                     mkdir "$gnusocial_dir/static"
542
                 fi
543
                 fi
543
-                cp -rp "$temp_restore_dir/static/*" "$gnusocial_dir/static/"
544
+                cp -rp "$temp_restore_dir/static/"* "$gnusocial_dir/static/"
544
             fi
545
             fi
545
             chown www-data:www-data "$gnusocial_dir/config.php"
546
             chown www-data:www-data "$gnusocial_dir/config.php"
546
             chown -R www-data:www-data "$gnusocial_dir/static"
547
             chown -R www-data:www-data "$gnusocial_dir/static"
555
                 if [ ! -d "$gnusocial_dir/file" ]; then
556
                 if [ ! -d "$gnusocial_dir/file" ]; then
556
                     mkdir "$gnusocial_dir/file"
557
                     mkdir "$gnusocial_dir/file"
557
                 fi
558
                 fi
558
-                cp -rp "$temp_restore_dir/*" "$gnusocial_dir/file/"
559
+                cp -rp "$temp_restore_dir/"* "$gnusocial_dir/file/"
559
             fi
560
             fi
560
             chown -R www-data:www-data "$gnusocial_dir/file"
561
             chown -R www-data:www-data "$gnusocial_dir/file"
561
             rm -rf $temp_restore_dir
562
             rm -rf $temp_restore_dir

+ 11
- 8
src/freedombone-app-gogs View File

166
         rm -rf "$INSTALL_DIR/gogs-repositories"
166
         rm -rf "$INSTALL_DIR/gogs-repositories"
167
     fi
167
     fi
168
     if [ -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
168
     if [ -d /home/${GOGS_USERNAME}/gogs-repositories ]; then
169
-        mv "/home/${GOGS_USERNAME}/gogs-repositories" "$INSTALL_DIR"
169
+        # shellcheck disable=SC2086
170
+        mv /home/${GOGS_USERNAME}/gogs-repositories $INSTALL_DIR
170
     fi
171
     fi
171
 
172
 
172
     gogs_parameters
173
     gogs_parameters
202
         exit 37823
203
         exit 37823
203
     fi
204
     fi
204
     rm -rf "/home/${GOGS_USERNAME:?}/"*
205
     rm -rf "/home/${GOGS_USERNAME:?}/"*
205
-    cp -r "${INSTALL_DIR}/gogs/*" "/home/${GOGS_USERNAME}"
206
+    cp -r "${INSTALL_DIR}/gogs/"* "/home/${GOGS_USERNAME}"
206
     if [ -f ${GOGS_FILE} ]; then
207
     if [ -f ${GOGS_FILE} ]; then
207
         rm ${GOGS_FILE}
208
         rm ${GOGS_FILE}
208
     fi
209
     fi
221
         rm -rf /home/${GOGS_USERNAME}/gogs-repositories
222
         rm -rf /home/${GOGS_USERNAME}/gogs-repositories
222
     fi
223
     fi
223
     if [ -d "$INSTALL_DIR/gogs-repositories" ]; then
224
     if [ -d "$INSTALL_DIR/gogs-repositories" ]; then
224
-        mv "$INSTALL_DIR/gogs-repositories" "/home/${GOGS_USERNAME}/gogs-repositories"
225
+        # shellcheck disable=SC2086
226
+        mv $INSTALL_DIR/gogs-repositories /home/${GOGS_USERNAME}/gogs-repositories
225
     fi
227
     fi
226
     chown -R "${GOGS_USERNAME}":"${GOGS_USERNAME}" "/home/${GOGS_USERNAME}"
228
     chown -R "${GOGS_USERNAME}":"${GOGS_USERNAME}" "/home/${GOGS_USERNAME}"
227
 
229
 
273
                 mkdir -p $GOGS_CONFIG_PATH
275
                 mkdir -p $GOGS_CONFIG_PATH
274
             fi
276
             fi
275
             if [ -d "/root/tempgogs/home/${GOGS_USERNAME}/custom" ]; then
277
             if [ -d "/root/tempgogs/home/${GOGS_USERNAME}/custom" ]; then
276
-                cp -r "/root/tempgogs/home/${GOGS_USERNAME}/custom/*" "/home/${GOGS_USERNAME}/custom/"
278
+                cp -r "/root/tempgogs/home/${GOGS_USERNAME}/custom/"* "/home/${GOGS_USERNAME}/custom/"
277
             else
279
             else
278
-                cp -r "/root/tempgogs/*" "/home/${GOGS_USERNAME}/custom/"
280
+                cp -r "/root/tempgogs/"* "/home/${GOGS_USERNAME}/custom/"
279
             fi
281
             fi
280
             # shellcheck disable=SC2181
282
             # shellcheck disable=SC2181
281
             if [ ! "$?" = "0" ]; then
283
             if [ ! "$?" = "0" ]; then
292
                 mkdir "/home/${GOGS_USERNAME}/gogs-repositories"
294
                 mkdir "/home/${GOGS_USERNAME}/gogs-repositories"
293
             fi
295
             fi
294
             if [ -d "${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories" ]; then
296
             if [ -d "${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories" ]; then
295
-                cp -r "${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/*" "/home/${GOGS_USERNAME}/gogs-repositories/"
297
+                cp -r "${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/"* "/home/${GOGS_USERNAME}/gogs-repositories/"
296
             else
298
             else
297
-                cp -r "${temp_restore_dir}repos/*" "/home/${GOGS_USERNAME}/gogs-repositories/"
299
+                cp -r "${temp_restore_dir}repos/"* "/home/${GOGS_USERNAME}/gogs-repositories/"
298
             fi
300
             fi
299
             # shellcheck disable=SC2181
301
             # shellcheck disable=SC2181
300
             if [ ! "$?" = "0" ]; then
302
             if [ ! "$?" = "0" ]; then
351
 
353
 
352
         echo $"Obtaining Gogs repos backup"
354
         echo $"Obtaining Gogs repos backup"
353
 
355
 
356
+        # shellcheck disable=SC2086
354
         mv /home/$GOGS_USERNAME/gogs-repositories/*.git /home/$GOGS_USERNAME/gogs-repositories/bob
357
         mv /home/$GOGS_USERNAME/gogs-repositories/*.git /home/$GOGS_USERNAME/gogs-repositories/bob
355
         backup_directory_to_friend /home/$GOGS_USERNAME/gogs-repositories gogsrepos
358
         backup_directory_to_friend /home/$GOGS_USERNAME/gogs-repositories gogsrepos
356
 
359
 
508
         exit 37823
511
         exit 37823
509
     fi
512
     fi
510
     rm -rf "/home/${GOGS_USERNAME:?}/"*
513
     rm -rf "/home/${GOGS_USERNAME:?}/"*
511
-    cp -r "${INSTALL_DIR}/gogs/*" "/home/${GOGS_USERNAME}"
514
+    cp -r "${INSTALL_DIR}/gogs/"* "/home/${GOGS_USERNAME}"
512
     if [ -f ${GOGS_FILE} ]; then
515
     if [ -f ${GOGS_FILE} ]; then
513
         rm ${GOGS_FILE}
516
         rm ${GOGS_FILE}
514
     fi
517
     fi

+ 14
- 8
src/freedombone-app-htmly View File

247
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
247
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
248
                 rm -rf "/var/www/${HTMLY_DOMAIN_NAME}/previous"
248
                 rm -rf "/var/www/${HTMLY_DOMAIN_NAME}/previous"
249
             fi
249
             fi
250
-            mv "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" "/var/www/${HTMLY_DOMAIN_NAME}/previous"
250
+            # shellcheck disable=SC2086
251
+            mv /var/www/${HTMLY_DOMAIN_NAME}/htdocs /var/www/${HTMLY_DOMAIN_NAME}/previous
251
         fi
252
         fi
252
         if [ -d "${temp_restore_dir}/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
253
         if [ -d "${temp_restore_dir}/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
253
             temp_source_dir=$(find ${temp_restore_dir} -name htdocs)
254
             temp_source_dir=$(find ${temp_restore_dir} -name htdocs)
256
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
257
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
257
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
258
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
258
             fi
259
             fi
259
-            cp -r "${temp_restore_dir}/*" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
260
+            cp -r "${temp_restore_dir}/"* "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
260
         fi
261
         fi
261
         # shellcheck disable=SC2181
262
         # shellcheck disable=SC2181
262
         if [ ! "$?" = "0" ]; then
263
         if [ ! "$?" = "0" ]; then
263
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
264
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
264
-                mv "/var/www/${HTMLY_DOMAIN_NAME}/previous" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
265
+                # shellcheck disable=SC2086
266
+                mv /var/www/${HTMLY_DOMAIN_NAME}/previous /var/www/${HTMLY_DOMAIN_NAME}/htdocs
265
             fi
267
             fi
266
             set_user_permissions
268
             set_user_permissions
267
             backup_unmount_drive
269
             backup_unmount_drive
283
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
285
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
284
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
286
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
285
                 if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post" ]; then
287
                 if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post" ]; then
286
-                    mv "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/*.md" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post"
288
+                    # shellcheck disable=SC2086
289
+                    mv /var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/*.md /var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post
287
                 fi
290
                 fi
288
             fi
291
             fi
289
         done
292
         done
321
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
324
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
322
                 rm -rf "/var/www/${HTMLY_DOMAIN_NAME}/previous"
325
                 rm -rf "/var/www/${HTMLY_DOMAIN_NAME}/previous"
323
             fi
326
             fi
324
-            mv "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" "/var/www/${HTMLY_DOMAIN_NAME}/previous"
327
+            # shellcheck disable=SC2086
328
+            mv /var/www/${HTMLY_DOMAIN_NAME}/htdocs /var/www/${HTMLY_DOMAIN_NAME}/previous
325
         fi
329
         fi
326
 
330
 
327
         if [ -d "${temp_restore_dir}/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
331
         if [ -d "${temp_restore_dir}/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
331
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
335
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
332
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
336
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
333
             fi
337
             fi
334
-            cp -r "${temp_restore_dir}/*" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
338
+            cp -r "${temp_restore_dir}/"* "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
335
         fi
339
         fi
336
 
340
 
337
         # shellcheck disable=SC2181
341
         # shellcheck disable=SC2181
338
         if [ ! "$?" = "0" ]; then
342
         if [ ! "$?" = "0" ]; then
339
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
343
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
340
-                mv "/var/www/${HTMLY_DOMAIN_NAME}/previous" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
344
+                # shellcheck disable=SC2086
345
+                mv /var/www/${HTMLY_DOMAIN_NAME}/previous /var/www/${HTMLY_DOMAIN_NAME}/htdocs
341
             fi
346
             fi
342
             exit 593
347
             exit 593
343
         fi
348
         fi
354
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
359
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
355
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
360
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
356
                 if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post" ]; then
361
                 if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post" ]; then
357
-                    mv "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/*.md" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post"
362
+                    # shellcheck disable=SC2086
363
+                    mv /var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/*.md /var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post
358
                 fi
364
                 fi
359
             fi
365
             fi
360
         done
366
         done

+ 3
- 3
src/freedombone-app-hubzilla View File

220
         git merge --abort
220
         git merge --abort
221
         git stash
221
         git stash
222
         git pull
222
         git pull
223
-        cp -r "$HUBZILLA_PATH/redmatrix-themes1/*" "$HUBZILLA_PATH/view/theme/"
223
+        cp -r "$HUBZILLA_PATH/redmatrix-themes1/"* "$HUBZILLA_PATH/view/theme/"
224
         chown -R www-data:www-data "$HUBZILLA_PATH"
224
         chown -R www-data:www-data "$HUBZILLA_PATH"
225
     fi
225
     fi
226
 }
226
 }
248
             mkdir -p "$hubzilla_dir/store/[data]/smarty3"
248
             mkdir -p "$hubzilla_dir/store/[data]/smarty3"
249
         fi
249
         fi
250
         chmod 1777 "$hubzilla_dir/store/[data]/smarty3"
250
         chmod 1777 "$hubzilla_dir/store/[data]/smarty3"
251
-        chown -R www-data:www-data "$hubzilla_dir/*"
251
+        chown -R www-data:www-data "$hubzilla_dir/"*
252
         if [ -d $temp_restore_dir ]; then
252
         if [ -d $temp_restore_dir ]; then
253
             rm -rf $temp_restore_dir
253
             rm -rf $temp_restore_dir
254
         fi
254
         fi
287
             mkdir -p "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
287
             mkdir -p "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
288
         fi
288
         fi
289
         chmod 1777 "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
289
         chmod 1777 "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
290
-        chown -R www-data:www-data "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/*"
290
+        chown -R www-data:www-data "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/"*
291
     fi
291
     fi
292
     if [ -d /root/temphubzilla ]; then
292
     if [ -d /root/temphubzilla ]; then
293
         rm -rf /root/temphubzilla
293
         rm -rf /root/temphubzilla

+ 4
- 3
src/freedombone-app-icecast View File

213
     fi
213
     fi
214
 
214
 
215
     dest_dir=$(basename "$selected_dir")
215
     dest_dir=$(basename "$selected_dir")
216
-    mv "$selected_dir" $ICECAST_DIR
216
+    # shellcheck disable=SC2086
217
+    mv $selected_dir $ICECAST_DIR
217
 
218
 
218
     icecast_convert_files "$ICECAST_DIR/$dest_dir"
219
     icecast_convert_files "$ICECAST_DIR/$dest_dir"
219
     icecast_add_file_to_playlist "$ICECAST_DIR/$dest_dir"
220
     icecast_add_file_to_playlist "$ICECAST_DIR/$dest_dir"
236
         dialog --title $"Import stream files from USB drive" --msgbox $'No stream files directory found on USB drive' 6 50
237
         dialog --title $"Import stream files from USB drive" --msgbox $'No stream files directory found on USB drive' 6 50
237
         backup_unmount_drive "${USB_DRIVE}"
238
         backup_unmount_drive "${USB_DRIVE}"
238
     fi
239
     fi
239
-    cp -ru "$USB_MOUNT$ICECAST_DIR/*" $ICECAST_DIR
240
+    cp -ru "$USB_MOUNT$ICECAST_DIR/"* $ICECAST_DIR
240
     backup_unmount_drive "${USB_DRIVE}"
241
     backup_unmount_drive "${USB_DRIVE}"
241
     icecast_convert_files $ICECAST_DIR
242
     icecast_convert_files $ICECAST_DIR
242
     dialog --title $"Import stream files from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
243
     dialog --title $"Import stream files from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
255
     if [ ! -d "$USB_MOUNT$ICECAST_DIR" ]; then
256
     if [ ! -d "$USB_MOUNT$ICECAST_DIR" ]; then
256
         mkdir -p "$USB_MOUNT$ICECAST_DIR"
257
         mkdir -p "$USB_MOUNT$ICECAST_DIR"
257
     fi
258
     fi
258
-    cp -ru "$ICECAST_DIR/*" "$USB_MOUNT$ICECAST_DIR"
259
+    cp -ru "$ICECAST_DIR/"* "$USB_MOUNT$ICECAST_DIR"
259
     backup_unmount_drive "${USB_DRIVE}"
260
     backup_unmount_drive "${USB_DRIVE}"
260
     dialog --title $"Export stream files to USB drive" --msgbox $'Export complete. You may now remove the USB drive' 6 50
261
     dialog --title $"Export stream files to USB drive" --msgbox $'Export complete. You may now remove the USB drive' 6 50
261
 }
262
 }

+ 4
- 4
src/freedombone-app-ipfs View File

120
         restore_directory_from_usb $temp_restore_dir ipfs
120
         restore_directory_from_usb $temp_restore_dir ipfs
121
         ADMIN_USERNAME=$(get_completion_param "Admin user")
121
         ADMIN_USERNAME=$(get_completion_param "Admin user")
122
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
122
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
123
-            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/*" "/home/$ADMIN_USERNAME/.ipfs"
123
+            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/"* "/home/$ADMIN_USERNAME/.ipfs"
124
         else
124
         else
125
-            cp -rf "$temp_restore_dir/*" "/home/$ADMIN_USERNAME/.ipfs"
125
+            cp -rf "$temp_restore_dir/"* "/home/$ADMIN_USERNAME/.ipfs"
126
         fi
126
         fi
127
         # shellcheck disable=SC2181
127
         # shellcheck disable=SC2181
128
         if [ ! "$?" = "0" ]; then
128
         if [ ! "$?" = "0" ]; then
157
         function_check restore_directory_from_friend
157
         function_check restore_directory_from_friend
158
         restore_directory_from_friend $temp_restore_dir ipfs
158
         restore_directory_from_friend $temp_restore_dir ipfs
159
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
159
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
160
-            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/*" "/home/$ADMIN_USERNAME/.ipfs"
160
+            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/"* "/home/$ADMIN_USERNAME/.ipfs"
161
         else
161
         else
162
-            cp -rf "$temp_restore_dir/*" "/home/$ADMIN_USERNAME/.ipfs"
162
+            cp -rf "$temp_restore_dir/"* "/home/$ADMIN_USERNAME/.ipfs"
163
         fi
163
         fi
164
         # shellcheck disable=SC2181
164
         # shellcheck disable=SC2181
165
         if [ ! "$?" = "0" ]; then
165
         if [ ! "$?" = "0" ]; then

+ 2
- 2
src/freedombone-app-kanboard View File

262
                 if [ ! -d "$kanboard_dir/data" ]; then
262
                 if [ ! -d "$kanboard_dir/data" ]; then
263
                     mkdir "$kanboard_dir/data"
263
                     mkdir "$kanboard_dir/data"
264
                 fi
264
                 fi
265
-                cp -rp "$temp_restore_dir/*" "$kanboard_dir/data/"
265
+                cp -rp "$temp_restore_dir/"* "$kanboard_dir/data/"
266
             fi
266
             fi
267
             chown -R www-data:www-data "$kanboard_dir/data"
267
             chown -R www-data:www-data "$kanboard_dir/data"
268
             rm -rf $temp_restore_dir
268
             rm -rf $temp_restore_dir
343
                 if [ ! -d "$kanboard_dir/data" ]; then
343
                 if [ ! -d "$kanboard_dir/data" ]; then
344
                     mkdir "$kanboard_dir/data"
344
                     mkdir "$kanboard_dir/data"
345
                 fi
345
                 fi
346
-                cp -rp "$temp_restore_dir/*" "$kanboard_dir/data/"
346
+                cp -rp "$temp_restore_dir/"* "$kanboard_dir/data/"
347
             fi
347
             fi
348
             chown -R www-data:www-data "$kanboard_dir/data"
348
             chown -R www-data:www-data "$kanboard_dir/data"
349
             rm -rf $temp_restore_dir
349
             rm -rf $temp_restore_dir

+ 4
- 3
src/freedombone-app-koel View File

206
         255) return;;
206
         255) return;;
207
     esac
207
     esac
208
 
208
 
209
-    mv "$selected_dir" /music
209
+    # shellcheck disable=SC2086
210
+    mv $selected_dir /music
210
 
211
 
211
     dialog --title $"Import music directory" \
212
     dialog --title $"Import music directory" \
212
            --msgbox $"Import success. You may need to re-sync within Koel." 6 40
213
            --msgbox $"Import success. You may need to re-sync within Koel." 6 40
226
         dialog --title $"Import music from USB drive" --msgbox $'No Music directory found on USB drive' 6 50
227
         dialog --title $"Import music from USB drive" --msgbox $'No Music directory found on USB drive' 6 50
227
         backup_unmount_drive "${USB_DRIVE}"
228
         backup_unmount_drive "${USB_DRIVE}"
228
     fi
229
     fi
229
-    cp -ru "$USB_MOUNT/Music/*" /music
230
+    cp -ru "$USB_MOUNT/Music/"* /music
230
     backup_unmount_drive "${USB_DRIVE}"
231
     backup_unmount_drive "${USB_DRIVE}"
231
     dialog --title $"Import music from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
232
     dialog --title $"Import music from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
232
 }
233
 }
320
     cd "/var/www/${KOEL_DOMAIN_NAME}/htdocs" || exit 7345346358
321
     cd "/var/www/${KOEL_DOMAIN_NAME}/htdocs" || exit 7345346358
321
     php artisan koel:init
322
     php artisan koel:init
322
     koel_remove_gravatar
323
     koel_remove_gravatar
323
-    chown -R www-data:www-data "/var/www/${KOEL_DOMAIN_NAME}/htdocs/*"
324
+    chown -R www-data:www-data "/var/www/${KOEL_DOMAIN_NAME}/htdocs/"*
324
 
325
 
325
     systemctl start koel
326
     systemctl start koel
326
 }
327
 }

+ 3
- 2
src/freedombone-app-matrix View File

272
         print;
272
         print;
273
         }' "${filepath}" > "${ymltemp}"
273
         }' "${filepath}" > "${ymltemp}"
274
 
274
 
275
-    mv "${ymltemp}" "${filepath}"
275
+    # shellcheck disable=SC2086
276
+    mv ${ymltemp} ${filepath}
276
 
277
 
277
     if [[ $ONION_ONLY == "no" ]]; then
278
     if [[ $ONION_ONLY == "no" ]]; then
278
         sed -i "s|tls_certificate_path:.*|tls_certificate_path: \"/etc/ssl/certs/${MATRIX_DOMAIN_NAME}.pem\"|g" "${filepath}"
279
         sed -i "s|tls_certificate_path:.*|tls_certificate_path: \"/etc/ssl/certs/${MATRIX_DOMAIN_NAME}.pem\"|g" "${filepath}"
634
     fi
635
     fi
635
     rm -rf /usr/local/lib/python2.7/dist-packages/ldap*
636
     rm -rf /usr/local/lib/python2.7/dist-packages/ldap*
636
     if [ -d "$INSTALL_DIR/matrix" ]; then
637
     if [ -d "$INSTALL_DIR/matrix" ]; then
637
-        rm -rf "$INSTALL_DIR/matrix/*"
638
+        rm -rf "$INSTALL_DIR/matrix/"*
638
     fi
639
     fi
639
     if ! pip install --upgrade --process-dependency-links . -b "$INSTALL_DIR/matrix"; then
640
     if ! pip install --upgrade --process-dependency-links . -b "$INSTALL_DIR/matrix"; then
640
         echo $'Failed to install matrix home server'
641
         echo $'Failed to install matrix home server'

+ 2
- 2
src/freedombone-app-mediagoblin View File

230
         function_check restore_directory_from_friend
230
         function_check restore_directory_from_friend
231
         restore_directory_from_friend $temp_restore_dir mediagoblin
231
         restore_directory_from_friend $temp_restore_dir mediagoblin
232
         if [ -d "${temp_restore_dir}$MEDIAGOBLIN_BASE_DIR" ]; then
232
         if [ -d "${temp_restore_dir}$MEDIAGOBLIN_BASE_DIR" ]; then
233
-            cp -r "${temp_restore_dir}$MEDIAGOBLIN_BASE_DIR/*" "$MEDIAGOBLIN_BASE_DIR/"
233
+            cp -r "${temp_restore_dir}$MEDIAGOBLIN_BASE_DIR/"* "$MEDIAGOBLIN_BASE_DIR/"
234
         else
234
         else
235
-            cp -r "${temp_restore_dir}/*" "$MEDIAGOBLIN_BASE_DIR/"
235
+            cp -r "${temp_restore_dir}/"* "$MEDIAGOBLIN_BASE_DIR/"
236
         fi
236
         fi
237
         # shellcheck disable=SC2181
237
         # shellcheck disable=SC2181
238
         if [ ! "$?" = "0" ]; then
238
         if [ ! "$?" = "0" ]; then

+ 2
- 1
src/freedombone-app-nextcloud View File

692
     systemctl restart mariadb
692
     systemctl restart mariadb
693
 
693
 
694
     # move the data directory
694
     # move the data directory
695
-    mv "/var/www/${NEXTCLOUD_DOMAIN_NAME}/htdocs/data" "/var/www/${NEXTCLOUD_DOMAIN_NAME}/"
695
+    # shellcheck disable=SC2086
696
+    mv /var/www/${NEXTCLOUD_DOMAIN_NAME}/htdocs/data /var/www/${NEXTCLOUD_DOMAIN_NAME}/
696
     sed -i "s|'datadirectory'.*|'datadirectory' => '/var/www/$NEXTCLOUD_DOMAIN_NAME/data',|g" "/var/www/${NEXTCLOUD_DOMAIN_NAME}/htdocs/config/config.php"
697
     sed -i "s|'datadirectory'.*|'datadirectory' => '/var/www/$NEXTCLOUD_DOMAIN_NAME/data',|g" "/var/www/${NEXTCLOUD_DOMAIN_NAME}/htdocs/config/config.php"
697
 
698
 
698
     set_completion_param "nextcloud domain" "$NEXTCLOUD_DOMAIN_NAME"
699
     set_completion_param "nextcloud domain" "$NEXTCLOUD_DOMAIN_NAME"

+ 2
- 1
src/freedombone-app-pelican View File

222
 
222
 
223
     # move to the content directory
223
     # move to the content directory
224
     CURRENT_INDEX=$(cat $PELICAN_CURRENT_BLOG_INDEX)
224
     CURRENT_INDEX=$(cat $PELICAN_CURRENT_BLOG_INDEX)
225
-    mv "$PELICAN_BLOG_INSTALL_DIR/.new-blog-entry" "$BLOG_CONTENT_PATH/${CURRENT_INDEX}_post.md"
225
+    # shellcheck disable=SC2086
226
+    mv $PELICAN_BLOG_INSTALL_DIR/.new-blog-entry $BLOG_CONTENT_PATH/${CURRENT_INDEX}_post.md
226
 
227
 
227
     # increment the index
228
     # increment the index
228
     CURRENT_INDEX=$((CURRENT_INDEX + 1))
229
     CURRENT_INDEX=$((CURRENT_INDEX + 1))

+ 1
- 1
src/freedombone-app-pihole View File

71
     if [ ! -f $PIHOLE_CUSTOM_ADLIST ]; then
71
     if [ ! -f $PIHOLE_CUSTOM_ADLIST ]; then
72
         cp "$INSTALL_DIR/pihole/adlists.default" $PIHOLE_CUSTOM_ADLIST
72
         cp "$INSTALL_DIR/pihole/adlists.default" $PIHOLE_CUSTOM_ADLIST
73
     fi
73
     fi
74
-    cp "$INSTALL_DIR/pihole/advanced/Scripts/*" /opt/$piholeBasename
74
+    cp "$INSTALL_DIR/pihole/advanced/Scripts/"* /opt/$piholeBasename
75
     if [ -f /etc/dnsmasq.d/01-pihole.conf ]; then
75
     if [ -f /etc/dnsmasq.d/01-pihole.conf ]; then
76
         rm /etc/dnsmasq.d/01-pihole.conf
76
         rm /etc/dnsmasq.d/01-pihole.conf
77
     fi
77
     fi

+ 1
- 1
src/freedombone-app-pleroma View File

1099
 
1099
 
1100
     # back end
1100
     # back end
1101
     cd "$PLEROMA_DIR" || exit 246824684
1101
     cd "$PLEROMA_DIR" || exit 246824684
1102
-    chown -R pleroma:pleroma "$PLEROMA_DIR/*"
1102
+    chown -R pleroma:pleroma "$PLEROMA_DIR/"*
1103
     if ! sudo -u pleroma mix local.hex --force; then
1103
     if ! sudo -u pleroma mix local.hex --force; then
1104
         echo $'mix local.hex failed'
1104
         echo $'mix local.hex failed'
1105
         exit 1745673
1105
         exit 1745673

+ 6
- 5
src/freedombone-app-postactiv View File

373
 
373
 
374
     if [ -f "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index_qvitter.php" ]; then
374
     if [ -f "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index_qvitter.php" ]; then
375
         if [ -f "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index.php" ]; then
375
         if [ -f "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index.php" ]; then
376
-            mv "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index.php" "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index_qvitter.php"
376
+            # shellcheck disable=SC2086
377
+            mv /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index.php /var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index_qvitter.php
377
         fi
378
         fi
378
     fi
379
     fi
379
 
380
 
459
                 if [ ! -d "$postactiv_dir/static" ]; then
460
                 if [ ! -d "$postactiv_dir/static" ]; then
460
                     mkdir "$postactiv_dir/static"
461
                     mkdir "$postactiv_dir/static"
461
                 fi
462
                 fi
462
-                cp -rp "$temp_restore_dir/static/*" "$postactiv_dir/static/"
463
+                cp -rp "$temp_restore_dir/static/"* "$postactiv_dir/static/"
463
             fi
464
             fi
464
             chown www-data:www-data "$postactiv_dir/config.php"
465
             chown www-data:www-data "$postactiv_dir/config.php"
465
             chown -R www-data:www-data "$postactiv_dir/static"
466
             chown -R www-data:www-data "$postactiv_dir/static"
474
                 if [ ! -d "$postactiv_dir/file" ]; then
475
                 if [ ! -d "$postactiv_dir/file" ]; then
475
                     mkdir "$postactiv_dir/file"
476
                     mkdir "$postactiv_dir/file"
476
                 fi
477
                 fi
477
-                cp -rp "$temp_restore_dir/*" "$postactiv_dir/file/"
478
+                cp -rp "$temp_restore_dir/"* "$postactiv_dir/file/"
478
             fi
479
             fi
479
             chown -R www-data:www-data "$postactiv_dir/file"
480
             chown -R www-data:www-data "$postactiv_dir/file"
480
             rm -rf $temp_restore_dir
481
             rm -rf $temp_restore_dir
555
                 if [ ! -d "$postactiv_dir/static" ]; then
556
                 if [ ! -d "$postactiv_dir/static" ]; then
556
                     mkdir "$postactiv_dir/static"
557
                     mkdir "$postactiv_dir/static"
557
                 fi
558
                 fi
558
-                cp -rp "$temp_restore_dir/static/*" "$postactiv_dir/static/"
559
+                cp -rp "$temp_restore_dir/static/"* "$postactiv_dir/static/"
559
             fi
560
             fi
560
             chown www-data:www-data "$postactiv_dir/config.php"
561
             chown www-data:www-data "$postactiv_dir/config.php"
561
             chown -R www-data:www-data "$postactiv_dir/static"
562
             chown -R www-data:www-data "$postactiv_dir/static"
570
                 if [ ! -d "$postactiv_dir/file" ]; then
571
                 if [ ! -d "$postactiv_dir/file" ]; then
571
                     mkdir "$postactiv_dir/file"
572
                     mkdir "$postactiv_dir/file"
572
                 fi
573
                 fi
573
-                cp -rp "$temp_restore_dir/*" "$postactiv_dir/file/"
574
+                cp -rp "$temp_restore_dir/"* "$postactiv_dir/file/"
574
             fi
575
             fi
575
             chown -R www-data:www-data "$postactiv_dir/file"
576
             chown -R www-data:www-data "$postactiv_dir/file"
576
             rm -rf $temp_restore_dir
577
             rm -rf $temp_restore_dir

+ 4
- 4
src/freedombone-app-privatebin View File

205
         restore_directory_from_usb $temp_restore_dir privatebin
205
         restore_directory_from_usb $temp_restore_dir privatebin
206
         if [ -d $temp_restore_dir ]; then
206
         if [ -d $temp_restore_dir ]; then
207
             if [ -d "$temp_restore_dir$privatebin_dir" ]; then
207
             if [ -d "$temp_restore_dir$privatebin_dir" ]; then
208
-                cp -rp "$temp_restore_dir$privatebin_dir/*" "$privatebin_dir/"
208
+                cp -rp "$temp_restore_dir$privatebin_dir/"* "$privatebin_dir/"
209
             else
209
             else
210
-                cp -rp "$temp_restore_dir/*" "$privatebin_dir/"
210
+                cp -rp "$temp_restore_dir/"* "$privatebin_dir/"
211
             fi
211
             fi
212
             secure_privatebin
212
             secure_privatebin
213
             rm -rf $temp_restore_dir
213
             rm -rf $temp_restore_dir
249
         restore_directory_from_friend $temp_restore_dir privatebin
249
         restore_directory_from_friend $temp_restore_dir privatebin
250
         if [ -d $temp_restore_dir ]; then
250
         if [ -d $temp_restore_dir ]; then
251
             if [ -d "$temp_restore_dir$privatebin_dir" ]; then
251
             if [ -d "$temp_restore_dir$privatebin_dir" ]; then
252
-                cp -rp "$temp_restore_dir$privatebin_dir/*" "$privatebin_dir/"
252
+                cp -rp "$temp_restore_dir$privatebin_dir/"* "$privatebin_dir/"
253
             else
253
             else
254
-                cp -rp "$temp_restore_dir/*" "$privatebin_dir/"
254
+                cp -rp "$temp_restore_dir/"* "$privatebin_dir/"
255
             fi
255
             fi
256
             secure_privatebin
256
             secure_privatebin
257
             rm -rf $temp_restore_dir
257
             rm -rf $temp_restore_dir

+ 1
- 1
src/freedombone-app-riot View File

155
         echo $'Unable to extract Riot Web tarball'
155
         echo $'Unable to extract Riot Web tarball'
156
         exit 542826
156
         exit 542826
157
     fi
157
     fi
158
-    cp -r "$INSTALL_DIR/${RIOT_FILENAME}/*" "/var/www/$RIOT_DOMAIN_NAME/htdocs"
158
+    cp -r "$INSTALL_DIR/${RIOT_FILENAME}/"* "/var/www/$RIOT_DOMAIN_NAME/htdocs"
159
 
159
 
160
     chown -R www-data:www-data "/var/www/$RIOT_DOMAIN_NAME/htdocs"
160
     chown -R www-data:www-data "/var/www/$RIOT_DOMAIN_NAME/htdocs"
161
 }
161
 }

+ 2
- 2
src/freedombone-app-syncthing View File

346
                         cp -r /root/Sync/* "/home/$USERNAME/Sync/"
346
                         cp -r /root/Sync/* "/home/$USERNAME/Sync/"
347
                         rm -rf /root/Sync
347
                         rm -rf /root/Sync
348
                     else
348
                     else
349
-                        cp -r "${temp_restore_dir}/*" "/home/$USERNAME/Sync/"
349
+                        cp -r "${temp_restore_dir}/"* "/home/$USERNAME/Sync/"
350
                     fi
350
                     fi
351
                 fi
351
                 fi
352
                 # shellcheck disable=SC2181
352
                 # shellcheck disable=SC2181
473
                         cp -r /root/Sync/* "/home/$USERNAME/Sync/"
473
                         cp -r /root/Sync/* "/home/$USERNAME/Sync/"
474
                         rm -rf /root/Sync
474
                         rm -rf /root/Sync
475
                     else
475
                     else
476
-                        cp -r "${temp_restore_dir}/*" "/home/$USERNAME/Sync/"
476
+                        cp -r "${temp_restore_dir}/"* "/home/$USERNAME/Sync/"
477
                     fi
477
                     fi
478
                 fi
478
                 fi
479
                 # shellcheck disable=SC2181
479
                 # shellcheck disable=SC2181

+ 2
- 1
src/freedombone-app-tahoelafs View File

355
     # shellcheck disable=SC2181
355
     # shellcheck disable=SC2181
356
     if [ ! "$?" = "0" ]; then
356
     if [ ! "$?" = "0" ]; then
357
         if [ -d "${TAHOE_DIR}-old" ]; then
357
         if [ -d "${TAHOE_DIR}-old" ]; then
358
-            mv "${TAHOE_DIR}-old" $TAHOE_DIR
358
+            # shellcheck disable=SC2086
359
+            mv ${TAHOE_DIR}-old $TAHOE_DIR
359
         fi
360
         fi
360
         exit 623925
361
         exit 623925
361
     fi
362
     fi

+ 2
- 2
src/freedombone-app-tox View File

76
 
76
 
77
     if [ -d "/home/$remove_username/.config/tox" ]; then
77
     if [ -d "/home/$remove_username/.config/tox" ]; then
78
         if [ -d "/home/$remove_username/.config/tox/chatlogs" ]; then
78
         if [ -d "/home/$remove_username/.config/tox/chatlogs" ]; then
79
-            shred -zu "/home/$remove_username/.config/tox/chatlogs/*"
79
+            shred -zu "/home/$remove_username/.config/tox/chatlogs/"*
80
             rm -rf "/home/$remove_username/.config/tox/chatlogs"
80
             rm -rf "/home/$remove_username/.config/tox/chatlogs"
81
         fi
81
         fi
82
-        shred -zu "/home/$remove_username/.config/tox/*"
82
+        shred -zu "/home/$remove_username/.config/tox/"*
83
     fi
83
     fi
84
 }
84
 }
85
 
85
 

+ 4
- 4
src/freedombone-app-vim View File

106
                     if [ ! -d "/home/$USERNAME/$VIM_TEMP_DIR" ]; then
106
                     if [ ! -d "/home/$USERNAME/$VIM_TEMP_DIR" ]; then
107
                         mkdir "/home/$USERNAME/$VIM_TEMP_DIR"
107
                         mkdir "/home/$USERNAME/$VIM_TEMP_DIR"
108
                     fi
108
                     fi
109
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/$VIM_TEMP_DIR/"
109
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/$VIM_TEMP_DIR/"
110
                 fi
110
                 fi
111
                 # shellcheck disable=SC2181
111
                 # shellcheck disable=SC2181
112
                 if [ ! "$?" = "0" ]; then
112
                 if [ ! "$?" = "0" ]; then
117
                     backup_unmount_drive
117
                     backup_unmount_drive
118
                     exit 664
118
                     exit 664
119
                 fi
119
                 fi
120
-                cp "/home/$USERNAME/$VIM_TEMP_DIR/*" "/home/$USERNAME"
120
+                cp "/home/$USERNAME/$VIM_TEMP_DIR/"* "/home/$USERNAME"
121
                 if [ -f "/home/$USERNAME/.viminfo" ]; then
121
                 if [ -f "/home/$USERNAME/.viminfo" ]; then
122
                     chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.viminfo"
122
                     chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.viminfo"
123
                 fi
123
                 fi
182
                     if [ ! -d "/home/$USERNAME/$VIM_TEMP_DIR" ]; then
182
                     if [ ! -d "/home/$USERNAME/$VIM_TEMP_DIR" ]; then
183
                         mkdir "/home/$USERNAME/$VIM_TEMP_DIR"
183
                         mkdir "/home/$USERNAME/$VIM_TEMP_DIR"
184
                     fi
184
                     fi
185
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/$VIM_TEMP_DIR/"
185
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/$VIM_TEMP_DIR/"
186
                 fi
186
                 fi
187
                 # shellcheck disable=SC2181
187
                 # shellcheck disable=SC2181
188
                 if [ ! "$?" = "0" ]; then
188
                 if [ ! "$?" = "0" ]; then
193
                     backup_unmount_drive
193
                     backup_unmount_drive
194
                     exit 664
194
                     exit 664
195
                 fi
195
                 fi
196
-                cp "/home/$USERNAME/$VIM_TEMP_DIR/*" "/home/$USERNAME"
196
+                cp "/home/$USERNAME/$VIM_TEMP_DIR/"* "/home/$USERNAME"
197
                 if [ -f "/home/$USERNAME/.viminfo" ]; then
197
                 if [ -f "/home/$USERNAME/.viminfo" ]; then
198
                     chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.viminfo"
198
                     chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.viminfo"
199
                 fi
199
                 fi

+ 3
- 3
src/freedombone-app-xmpp View File

380
                     if [ ! -d /var/lib/prosody/prosody-modules ]; then
380
                     if [ ! -d /var/lib/prosody/prosody-modules ]; then
381
                         mkdir -p /var/lib/prosody/prosody-modules
381
                         mkdir -p /var/lib/prosody/prosody-modules
382
                     fi
382
                     fi
383
-                    cp -r "$INSTALL_DIR/prosody-modules/*" /var/lib/prosody/prosody-modules/
384
-                    cp -r "$INSTALL_DIR/prosody-modules/*" /usr/lib/prosody/modules/
383
+                    cp -r "$INSTALL_DIR/prosody-modules/"* /var/lib/prosody/prosody-modules/
384
+                    cp -r "$INSTALL_DIR/prosody-modules/"* /usr/lib/prosody/modules/
385
                     chown -R prosody:prosody /var/lib/prosody/prosody-modules
385
                     chown -R prosody:prosody /var/lib/prosody/prosody-modules
386
                     chown -R prosody:prosody /usr/lib/prosody/modules
386
                     chown -R prosody:prosody /usr/lib/prosody/modules
387
                     systemctl start prosody
387
                     systemctl start prosody
505
         set_completion_param "prosody_filename" "${prosody_filename}"
505
         set_completion_param "prosody_filename" "${prosody_filename}"
506
     fi
506
     fi
507
 
507
 
508
-    cp -r "$INSTALL_DIR/prosody-modules/*" /var/lib/prosody/prosody-modules/
508
+    cp -r "$INSTALL_DIR/prosody-modules/"* /var/lib/prosody/prosody-modules/
509
     chown -R prosody:prosody /var/lib/prosody/prosody-modules
509
     chown -R prosody:prosody /var/lib/prosody/prosody-modules
510
 
510
 
511
     systemctl restart prosody
511
     systemctl restart prosody

+ 3
- 3
src/freedombone-app-zeronet View File

203
 
203
 
204
     echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
204
     echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
205
     echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
205
     echo $"ZeroNet Blog private key: $ZERONET_BLOG_PRIVATE_KEY"
206
-    cp -r "$MESH_INSTALL_DIR/zeronet/ZeroBlog/*" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS"
206
+    cp -r "$MESH_INSTALL_DIR/zeronet/ZeroBlog/"* "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS"
207
 
207
 
208
     if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data" ]; then
208
     if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data" ]; then
209
         mkdir "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data"
209
         mkdir "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data"
286
 
286
 
287
     echo $"ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS"
287
     echo $"ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS"
288
     echo $"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY"
288
     echo $"ZeroNet Mail private key: $ZERONET_MAIL_PRIVATE_KEY"
289
-    cp -r "$MESH_INSTALL_DIR/zeronet/ZeroMail/*" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS"
289
+    cp -r "$MESH_INSTALL_DIR/zeronet/ZeroMail/"* "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS"
290
 
290
 
291
     if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data" ]; then
291
     if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data" ]; then
292
         mkdir "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data"
292
         mkdir "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data"
368
 
368
 
369
     echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
369
     echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
370
     echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
370
     echo $"Forum private key: $ZERONET_FORUM_PRIVATE_KEY"
371
-    cp -r "$MESH_INSTALL_DIR/zeronet/ZeroTalk/*" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS"
371
+    cp -r "$MESH_INSTALL_DIR/zeronet/ZeroTalk/"* "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS"
372
     sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
372
     sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
373
     sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
373
     sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
374
     sed -i "s|Demo for dynamic, decentralized content publishing.|$ZERONET_DEFAULT_FORUM_TAGLINE|g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
374
     sed -i "s|Demo for dynamic, decentralized content publishing.|$ZERONET_DEFAULT_FORUM_TAGLINE|g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"

+ 1
- 1
src/freedombone-backup-remote View File

421
                 fi
421
                 fi
422
 
422
 
423
                 # remove the temp file/directory
423
                 # remove the temp file/directory
424
-                shred -zu "$temp_key_share_fragments/*"
424
+                shred -zu "$temp_key_share_fragments/"*
425
                 rm -rf "$temp_key_share_dir"
425
                 rm -rf "$temp_key_share_dir"
426
             fi
426
             fi
427
         fi
427
         fi

+ 2
- 2
src/freedombone-base-email View File

1330
             else
1330
             else
1331
                 chown -R "$MY_USERNAME":"$MY_USERNAME" "$gpg_dir"
1331
                 chown -R "$MY_USERNAME":"$MY_USERNAME" "$gpg_dir"
1332
                 chmod 700 "$gpg_dir"
1332
                 chmod 700 "$gpg_dir"
1333
-                chmod 600 "$gpg_dir/*"
1333
+                chmod 600 "$gpg_dir/"*
1334
                 printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > "/home/$MY_USERNAME/.gnupg/S.dirmngr"
1334
                 printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > "/home/$MY_USERNAME/.gnupg/S.dirmngr"
1335
                 if [ -d "/home/$MY_USERNAME/.gnupg/crls.d" ]; then
1335
                 if [ -d "/home/$MY_USERNAME/.gnupg/crls.d" ]; then
1336
                     chmod +x "/home/$MY_USERNAME/.gnupg/crls.d"
1336
                     chmod +x "/home/$MY_USERNAME/.gnupg/crls.d"
1362
 
1362
 
1363
     chown -R "$MY_USERNAME":"$MY_USERNAME" "$gpg_dir"
1363
     chown -R "$MY_USERNAME":"$MY_USERNAME" "$gpg_dir"
1364
     chmod 700 "$gpg_dir"
1364
     chmod 700 "$gpg_dir"
1365
-    chmod 600 "$gpg_dir/*"
1365
+    chmod 600 "$gpg_dir/"*
1366
     printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > "$gpg_dir/S.dirmngr"
1366
     printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > "$gpg_dir/S.dirmngr"
1367
     if [ -d "$gpg_dir/crls.d" ]; then
1367
     if [ -d "$gpg_dir/crls.d" ]; then
1368
         chmod +x "$gpg_dir/crls.d"
1368
         chmod +x "$gpg_dir/crls.d"

+ 2
- 1
src/freedombone-client View File

107
 function ssh_remove_small_moduli {
107
 function ssh_remove_small_moduli {
108
     # shellcheck disable=SC2024
108
     # shellcheck disable=SC2024
109
     sudo awk '$5 > 2000' /etc/ssh/moduli > "/home/$CURR_USER/moduli"
109
     sudo awk '$5 > 2000' /etc/ssh/moduli > "/home/$CURR_USER/moduli"
110
-    sudo mv "/home/$CURR_USER/moduli" /etc/ssh/moduli
110
+    # shellcheck disable=SC2086
111
+    sudo mv /home/$CURR_USER/moduli /etc/ssh/moduli
111
 }
112
 }
112
 
113
 
113
 function configure_ssh_client {
114
 function configure_ssh_client {

+ 6
- 3
src/freedombone-clientcert View File

137
 
137
 
138
 # move the cert to the user's home
138
 # move the cert to the user's home
139
 mkdir "/home/$USERNAME/emailcert"
139
 mkdir "/home/$USERNAME/emailcert"
140
-mv "/etc/ssl/certs/$USERNAME.cer" "/home/$USERNAME/emailcert"
140
+# shellcheck disable=SC2086
141
+mv /etc/ssl/certs/$USERNAME.cer /home/$USERNAME/emailcert
141
 cp "/etc/ssl/certs/dovecot.crt" "/home/$USERNAME/emailcert"
142
 cp "/etc/ssl/certs/dovecot.crt" "/home/$USERNAME/emailcert"
142
 cp "/etc/ssl/certs/ca-$HOSTNAME.crt" "/home/$USERNAME/emailcert"
143
 cp "/etc/ssl/certs/ca-$HOSTNAME.crt" "/home/$USERNAME/emailcert"
143
-mv "/etc/ssl/private/$USERNAME.key" "/home/$USERNAME/emailcert"
144
-mv "/etc/ssl/certs/$USERNAME.crt" "/home/$USERNAME/emailcert"
144
+# shellcheck disable=SC2086
145
+mv /etc/ssl/private/$USERNAME.key /home/$USERNAME/emailcert
146
+# shellcheck disable=SC2086
147
+mv /etc/ssl/certs/$USERNAME.crt /home/$USERNAME/emailcert
145
 openssl pkcs12 -export -in "/home/$USERNAME/emailcert/$USERNAME.cer" \
148
 openssl pkcs12 -export -in "/home/$USERNAME/emailcert/$USERNAME.cer" \
146
         -out "/home/$USERNAME/emailcert/$USERNAME.p12" \
149
         -out "/home/$USERNAME/emailcert/$USERNAME.p12" \
147
         -inkey "/home/$USERNAME/emailcert/$USERNAME.key" \
150
         -inkey "/home/$USERNAME/emailcert/$USERNAME.key" \

+ 5
- 3
src/freedombone-controlpanel View File

1343
     fi
1343
     fi
1344
     if [ ! -f "/etc/tripwire/${HOSTNAME}-local.key" ]; then
1344
     if [ ! -f "/etc/tripwire/${HOSTNAME}-local.key" ]; then
1345
         if [ -f "/etc/tripwire/${PROJECT_NAME}-local.key" ]; then
1345
         if [ -f "/etc/tripwire/${PROJECT_NAME}-local.key" ]; then
1346
-            mv "/etc/tripwire/${PROJECT_NAME}-local.key" "/etc/tripwire/${HOSTNAME}-local.key"
1347
-            mv "/etc/tripwire/${PROJECT_NAME}-site.key" "/etc/tripwire/${HOSTNAME}-site.key"
1346
+            # shellcheck disable=SC2086
1347
+            mv /etc/tripwire/${PROJECT_NAME}-local.key /etc/tripwire/${HOSTNAME}-local.key
1348
+            # shellcheck disable=SC2086
1349
+            mv /etc/tripwire/${PROJECT_NAME}-site.key /etc/tripwire/${HOSTNAME}-site.key
1348
         else
1350
         else
1349
             echo $'Error: missing local key'
1351
             echo $'Error: missing local key'
1350
             any_key
1352
             any_key
2153
             clacks=$(<"$data")
2155
             clacks=$(<"$data")
2154
             if [ ${#clacks} -gt 1 ]; then
2156
             if [ ${#clacks} -gt 1 ]; then
2155
 
2157
 
2156
-                WEB_FILES="/etc/nginx/sites-available/*"
2158
+                WEB_FILES="/etc/nginx/sites-available/"*
2157
                 for f in $WEB_FILES
2159
                 for f in $WEB_FILES
2158
                 do
2160
                 do
2159
                     if grep -q "X-Clacks-Overhead" "$f"; then
2161
                     if grep -q "X-Clacks-Overhead" "$f"; then

+ 7
- 4
src/freedombone-image View File

243
             makepkg --force --noconfirm
243
             makepkg --force --noconfirm
244
             makepkg -i --force --noconfirm
244
             makepkg -i --force --noconfirm
245
             sudo wget "https://raw.githubusercontent.com/bashrc/freedombone/master/image_build/debootstrap/scripts/${DEBIAN_VERSION}" -O /usr/share/debootstrap/scripts/debscript
245
             sudo wget "https://raw.githubusercontent.com/bashrc/freedombone/master/image_build/debootstrap/scripts/${DEBIAN_VERSION}" -O /usr/share/debootstrap/scripts/debscript
246
-            sudo cp -f "/usr/share/debootstrap/scripts/debscript /usr/share/debootstrap/scripts/${DEBIAN_VERSION}"
246
+            sudo cp -f "/usr/share/debootstrap/scripts/debscript" "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}"
247
             if [ ! -f "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}" ]; then
247
             if [ ! -f "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}" ]; then
248
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"
248
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"
249
                 return
249
                 return
490
         if [ ! -d "${CURR_DIR}/build" ]; then
490
         if [ ! -d "${CURR_DIR}/build" ]; then
491
             mkdir "${CURR_DIR}/build"
491
             mkdir "${CURR_DIR}/build"
492
         fi
492
         fi
493
-        mv -f "${CURR_DIR}/${PROJECT_NAME}*.${im}" "${CURR_DIR}/build"
493
+        # shellcheck disable=SC2086
494
+        mv -f ${CURR_DIR}/${PROJECT_NAME}*.${im} ${CURR_DIR}/build
494
     fi
495
     fi
495
 done
496
 done
496
 
497
 
628
     # shellcheck disable=SC2012,SC2086
629
     # shellcheck disable=SC2012,SC2086
629
     no_of_files=$(ls -afq build/${PROJECT_NAME}*.${im} | wc -l)
630
     no_of_files=$(ls -afq build/${PROJECT_NAME}*.${im} | wc -l)
630
     if (( no_of_files > 0 )); then
631
     if (( no_of_files > 0 )); then
631
-        mv "build/${PROJECT_NAME}*.${im}" "${CURR_DIR}/"
632
-        sudo chown "${CURR_USER}":"${CURR_USER}" "${CURR_DIR}/*.${im}"
632
+        # shellcheck disable=SC2086
633
+        mv build/${PROJECT_NAME}*.${im} ${CURR_DIR}/
634
+        # shellcheck disable=SC2086
635
+        sudo chown "${CURR_USER}":"${CURR_USER}" ${CURR_DIR}/*.${im}
633
     fi
636
     fi
634
 done
637
 done
635
 
638
 

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

1798
         echo 'Go binary not installed'
1798
         echo 'Go binary not installed'
1799
         exit 763562
1799
         exit 763562
1800
     fi
1800
     fi
1801
-    mv "${rootdir}/home/go/go" "${rootdir}/home/go/go${GO_VERSION}"
1801
+    # shellcheck disable=SC2086
1802
+    mv ${rootdir}/home/go/go ${rootdir}/home/go/go${GO_VERSION}
1802
     echo "export GOROOT=/home/go" >> "${rootdir}/root/.bashrc"
1803
     echo "export GOROOT=/home/go" >> "${rootdir}/root/.bashrc"
1803
     echo "export GOROOT=/home/go" >> "${rootdir}/etc/skel/.bashrc"
1804
     echo "export GOROOT=/home/go" >> "${rootdir}/etc/skel/.bashrc"
1804
     echo "export GOROOT=/home/go" >> "${rootdir}/home/go/.bashrc"
1805
     echo "export GOROOT=/home/go" >> "${rootdir}/home/go/.bashrc"
1809
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/etc/skel/.bashrc"
1810
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/etc/skel/.bashrc"
1810
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
1811
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
1811
     chroot "$rootdir" chown -R go:go /home/go
1812
     chroot "$rootdir" chown -R go:go /home/go
1812
-    cp "${rootdir}/home/go/go${GO_VERSION}/bin/*" "${rootdir}/usr/bin"
1813
+    cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"
1813
 
1814
 
1814
     # Tomb
1815
     # Tomb
1815
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses
1816
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses

+ 3
- 3
src/freedombone-image-hardware-setup View File

207
 
207
 
208
     # Copy all DTBs
208
     # Copy all DTBs
209
     mkdir -p /boot/dtbs
209
     mkdir -p /boot/dtbs
210
-    cp "/usr/lib/$kernelVersion/*" /boot/dtbs
210
+    cp "/usr/lib/$kernelVersion/"* /boot/dtbs
211
 
211
 
212
     # extra boot modules
212
     # extra boot modules
213
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules
213
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules
218
     if [ ! -d /etc/flash-kernel ] ; then
218
     if [ ! -d /etc/flash-kernel ] ; then
219
        mkdir /etc/flash-kernel
219
        mkdir /etc/flash-kernel
220
     fi
220
     fi
221
-    echo "$1" > /etc/flash-kernel/machine
221
+    printf "%s" "$1" > /etc/flash-kernel/machine
222
 
222
 
223
     command_line=""
223
     command_line=""
224
     if [ -n "$2" ] ; then
224
     if [ -n "$2" ] ; then
226
     fi
226
     fi
227
 
227
 
228
     if [ -n "$command_line" ] ; then
228
     if [ -n "$command_line" ] ; then
229
-        echo flash-kernel flash-kernel/linux_cmdline string "$command_line" | debconf-set-selections
229
+        echo "flash-kernel flash-kernel/linux_cmdline string \"$command_line\"" | debconf-set-selections
230
     fi
230
     fi
231
 
231
 
232
     apt-get install -y flash-kernel
232
     apt-get install -y flash-kernel

+ 3
- 2
src/freedombone-image-make View File

247
 
247
 
248
 # Run vmdebootstrap script to create image
248
 # Run vmdebootstrap script to create image
249
 vmdebootstrap_failed=
249
 vmdebootstrap_failed=
250
+# shellcheck disable=SC2086
250
 sudo -H \
251
 sudo -H \
251
      SUITE="$SUITE" \
252
      SUITE="$SUITE" \
252
      MIRROR="$MIRROR" \
253
      MIRROR="$MIRROR" \
267
      --lock-root-password \
268
      --lock-root-password \
268
      --arch "$ARCHITECTURE" \
269
      --arch "$ARCHITECTURE" \
269
      --distribution "$SUITE" \
270
      --distribution "$SUITE" \
270
-     "$extra_opts" \
271
-     "$pkgopts"
271
+     $extra_opts \
272
+     $pkgopts
272
 
273
 
273
 echo $'Removing customised customisation script'
274
 echo $'Removing customised customisation script'
274
 sudo shred -zu $TEMP_CUSTOMISE
275
 sudo shred -zu $TEMP_CUSTOMISE

+ 1
- 1
src/freedombone-image-mesh View File

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"

+ 2
- 1
src/freedombone-mesh-blog View File

125
 
125
 
126
     # move to the content directory
126
     # move to the content directory
127
     CURRENT_INDEX=$(cat "$CURRENT_BLOG_INDEX")
127
     CURRENT_INDEX=$(cat "$CURRENT_BLOG_INDEX")
128
-    mv ~/.new-blog-entry "$BLOG_CONTENT_PATH/${CURRENT_INDEX}_post.md"
128
+    # shellcheck disable=SC2086
129
+    mv ~/.new-blog-entry $BLOG_CONTENT_PATH/${CURRENT_INDEX}_post.md
129
 
130
 
130
     # increment the index
131
     # increment the index
131
     CURRENT_INDEX=$((CURRENT_INDEX + 1))
132
     CURRENT_INDEX=$((CURRENT_INDEX + 1))

+ 1
- 1
src/freedombone-pass View File

141
     for d in /root/.passwords/*/ ; do
141
     for d in /root/.passwords/*/ ; do
142
         USERNAME=$(echo "$d" | awk -F '/' '{print $4}')
142
         USERNAME=$(echo "$d" | awk -F '/' '{print $4}')
143
         if [[ "$USERNAME" != 'root' ]]; then
143
         if [[ "$USERNAME" != 'root' ]]; then
144
-            shred -zu "/root/.passwords/$USERNAME/*"
144
+            shred -zu "/root/.passwords/$USERNAME/"*
145
             rm -rf "/root/.passwords/$USERNAME"
145
             rm -rf "/root/.passwords/$USERNAME"
146
         fi
146
         fi
147
     done
147
     done

+ 1
- 1
src/freedombone-recoverkey View File

123
 
123
 
124
             echo -n $"Starting key retrieval from $REMOTE_SERVER..."
124
             echo -n $"Starting key retrieval from $REMOTE_SERVER..."
125
             /usr/bin/sshpass -p "$REMOTE_PASSWORD" \
125
             /usr/bin/sshpass -p "$REMOTE_PASSWORD" \
126
-                             scp -r -P "$REMOTE_SSH_PORT" "$REMOTE_SERVER/.gnupg_fragments/*" "/home/$MY_USERNAME/.gnupg_fragments"
126
+                             scp -r -P "$REMOTE_SSH_PORT" "$REMOTE_SERVER/.gnupg_fragments/"* "/home/$MY_USERNAME/.gnupg_fragments"
127
             # shellcheck disable=SC2181
127
             # shellcheck disable=SC2181
128
             if [ ! "$?" = "0" ]; then
128
             if [ ! "$?" = "0" ]; then
129
                 echo $'FAILED'
129
                 echo $'FAILED'

+ 5
- 4
src/freedombone-restore-local View File

561
                     if [ ! -d "/home/$USERNAME/.spamassassin" ]; then
561
                     if [ ! -d "/home/$USERNAME/.spamassassin" ]; then
562
                         mkdir "/home/$USERNAME/.spamassassin"
562
                         mkdir "/home/$USERNAME/.spamassassin"
563
                     fi
563
                     fi
564
-                        cp -rf "$temp_restore_dir/*" "/home/$USERNAME/.spamassassin/"
564
+                        cp -rf "$temp_restore_dir/"* "/home/$USERNAME/.spamassassin/"
565
                     fi
565
                     fi
566
                     # shellcheck disable=SC2181
566
                     # shellcheck disable=SC2181
567
                     if [ ! "$?" = "0" ]; then
567
                     if [ ! "$?" = "0" ]; then
634
                     if [ ! -d "/home/$USERNAME/.ssh" ]; then
634
                     if [ ! -d "/home/$USERNAME/.ssh" ]; then
635
                         mkdir "/home/$USERNAME/.ssh"
635
                         mkdir "/home/$USERNAME/.ssh"
636
                     fi
636
                     fi
637
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.ssh/"
637
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.ssh/"
638
                 fi
638
                 fi
639
                 # shellcheck disable=SC2181
639
                 # shellcheck disable=SC2181
640
                 if [ ! "$?" = "0" ]; then
640
                 if [ ! "$?" = "0" ]; then
753
                     if [ ! -d "/home/$USERNAME/.fin" ]; then
753
                     if [ ! -d "/home/$USERNAME/.fin" ]; then
754
                         mkdir "/home/$USERNAME/.fin"
754
                         mkdir "/home/$USERNAME/.fin"
755
                     fi
755
                     fi
756
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.fin/"
756
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.fin/"
757
                 fi
757
                 fi
758
                 # shellcheck disable=SC2181
758
                 # shellcheck disable=SC2181
759
                 if [ ! "$?" = "0" ]; then
759
                 if [ ! "$?" = "0" ]; then
876
                         rm -rf "/home/$USERNAME/personal"
876
                         rm -rf "/home/$USERNAME/personal"
877
                     fi
877
                     fi
878
                     if [ -d "$temp_restore_dir/home/$USERNAME/personal" ]; then
878
                     if [ -d "$temp_restore_dir/home/$USERNAME/personal" ]; then
879
-                        mv "$temp_restore_dir/home/$USERNAME/personal" "/home/$USERNAME"
879
+                        # shellcheck disable=SC2086
880
+                        mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
880
                     else
881
                     else
881
                         if [ ! -d "/home/$USERNAME/personal" ]; then
882
                         if [ ! -d "/home/$USERNAME/personal" ]; then
882
                             mkdir "/home/$USERNAME/personal"
883
                             mkdir "/home/$USERNAME/personal"

+ 4
- 3
src/freedombone-restore-remote View File

432
                     if [ ! -d "/home/$USERNAME/.gnupg" ]; then
432
                     if [ ! -d "/home/$USERNAME/.gnupg" ]; then
433
                         mkdir "/home/$USERNAME/.gnupg"
433
                         mkdir "/home/$USERNAME/.gnupg"
434
                     fi
434
                     fi
435
-                    cp -r "${temp_restore_dir}/*" "/home/$USERNAME/.gnupg/"
435
+                    cp -r "${temp_restore_dir}/"* "/home/$USERNAME/.gnupg/"
436
                 fi
436
                 fi
437
                 # shellcheck disable=SC2181
437
                 # shellcheck disable=SC2181
438
                 if [ ! "$?" = "0" ]; then
438
                 if [ ! "$?" = "0" ]; then
599
                     if [ ! -d "/home/$USERNAME/.config" ]; then
599
                     if [ ! -d "/home/$USERNAME/.config" ]; then
600
                         mkdir "/home/$USERNAME/.config"
600
                         mkdir "/home/$USERNAME/.config"
601
                     fi
601
                     fi
602
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.config/"
602
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.config/"
603
                 fi
603
                 fi
604
                 # shellcheck disable=SC2181
604
                 # shellcheck disable=SC2181
605
                 if [ ! "$?" = "0" ]; then
605
                 if [ ! "$?" = "0" ]; then
792
                     if [ -d "/home/$USERNAME/personal" ]; then
792
                     if [ -d "/home/$USERNAME/personal" ]; then
793
                         rm -rf "/home/$USERNAME/personal"
793
                         rm -rf "/home/$USERNAME/personal"
794
                     fi
794
                     fi
795
-                    mv "$temp_restore_dir/home/$USERNAME/personal" "/home/$USERNAME"
795
+                    # shellcheck disable=SC2086
796
+                    mv $temp_restore_dir/home/$USERNAME/personal /home/$USERNAME
796
                 else
797
                 else
797
                     if [ ! -d "/home/$USERNAME/personal" ]; then
798
                     if [ ! -d "/home/$USERNAME/personal" ]; then
798
                         mkdir "/home/$USERNAME/personal"
799
                         mkdir "/home/$USERNAME/personal"

+ 2
- 2
src/freedombone-rmuser View File

113
 
113
 
114
 # remove gpg keys
114
 # remove gpg keys
115
 if [ -d "/home/$REMOVE_USERNAME/.gnupg" ]; then
115
 if [ -d "/home/$REMOVE_USERNAME/.gnupg" ]; then
116
-    shred -zu "/home/$REMOVE_USERNAME/.gnupg/*"
116
+    shred -zu "/home/$REMOVE_USERNAME/.gnupg/"*
117
 fi
117
 fi
118
 
118
 
119
 # remove ssh keys
119
 # remove ssh keys
120
 if [ -d "/home/$REMOVE_USERNAME/.ssh" ]; then
120
 if [ -d "/home/$REMOVE_USERNAME/.ssh" ]; then
121
-    shred -zu "/home/$REMOVE_USERNAME/.ssh/*"
121
+    shred -zu "/home/$REMOVE_USERNAME/.ssh/"*
122
 fi
122
 fi
123
 
123
 
124
 echo $'Detecting installed apps...'
124
 echo $'Detecting installed apps...'

+ 1
- 1
src/freedombone-upgrade View File

75
 if [ -d "$PROJECT_DIR" ]; then
75
 if [ -d "$PROJECT_DIR" ]; then
76
     if [ -f "$CONFIGURATION_FILE" ]; then
76
     if [ -f "$CONFIGURATION_FILE" ]; then
77
         cd "$PROJECT_DIR" || exit 246823484
77
         cd "$PROJECT_DIR" || exit 246823484
78
-        rm -rf "$PROJECT_DIR/locale/*"
78
+        rm -rf "$PROJECT_DIR/locale/"*
79
         if [[ "$CURRENT_BRANCH" == *"master" ]]; then
79
         if [[ "$CURRENT_BRANCH" == *"master" ]]; then
80
             git_pull $PROJECT_REPO
80
             git_pull $PROJECT_REPO
81
         else
81
         else

+ 16
- 14
src/freedombone-utils-backup View File

260
     if [ -f "${local_database_dir}/${1}.${database_file_extension}" ]; then
260
     if [ -f "${local_database_dir}/${1}.${database_file_extension}" ]; then
261
         if [ ! -s "${local_database_dir}/${1}.${database_file_extension}" ]; then
261
         if [ ! -s "${local_database_dir}/${1}.${database_file_extension}" ]; then
262
             echo $"${1} database could not be saved"
262
             echo $"${1} database could not be saved"
263
-            shred -zu "${local_database_dir}/*"
263
+            shred -zu "${local_database_dir}/"*
264
             rm -rf "${local_database_dir}"
264
             rm -rf "${local_database_dir}"
265
             umount "$USB_MOUNT"
265
             umount "$USB_MOUNT"
266
             rm -rf "$USB_MOUNT"
266
             rm -rf "$USB_MOUNT"
286
         umount "$USB_MOUNT"
286
         umount "$USB_MOUNT"
287
         rm -rf "$USB_MOUNT"
287
         rm -rf "$USB_MOUNT"
288
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
288
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
289
-            shred -zu "${1}/*"
289
+            shred -zu "${1}/"*
290
             rm -rf "${1}"
290
             rm -rf "${1}"
291
         fi
291
         fi
292
         function_check restart_site
292
         function_check restart_site
301
             umount "$USB_MOUNT"
301
             umount "$USB_MOUNT"
302
             rm -rf "$USB_MOUNT"
302
             rm -rf "$USB_MOUNT"
303
             if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
303
             if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
304
-                shred -zu "${1}/*"
304
+                shred -zu "${1}/"*
305
                 rm -rf "${1}"
305
                 rm -rf "${1}"
306
             fi
306
             fi
307
             function_check restart_site
307
             function_check restart_site
334
         backup_directory_to_usb_duplicity "${1}" "${2}"
334
         backup_directory_to_usb_duplicity "${1}" "${2}"
335
 
335
 
336
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
336
         if [[ ${1} == "/root/temp"* || ${1} == *"tempbackup" ]]; then
337
-            shred -zu "${1}/*"
337
+            shred -zu "${1}/"*
338
             rm -rf "${1}"
338
             rm -rf "${1}"
339
         fi
339
         fi
340
     fi
340
     fi
416
     # shellcheck disable=SC2181
416
     # shellcheck disable=SC2181
417
     if [ ! "$?" = "0" ]; then
417
     if [ ! "$?" = "0" ]; then
418
         if [[ "${1}" == "/root/temp"* || ${1} == *"tempbackup" ]]; then
418
         if [[ "${1}" == "/root/temp"* || ${1} == *"tempbackup" ]]; then
419
-            shred -zu "${1}/*"
419
+            shred -zu "${1}/"*
420
             rm -rf "${1}"
420
             rm -rf "${1}"
421
         fi
421
         fi
422
         function_check restart_site
422
         function_check restart_site
429
         # shellcheck disable=SC2181
429
         # shellcheck disable=SC2181
430
         if [ ! "$?" = "0" ]; then
430
         if [ ! "$?" = "0" ]; then
431
             if [[ "${1}" == "/root/temp"* || ${1} == *"tempbackup" ]]; then
431
             if [[ "${1}" == "/root/temp"* || ${1} == *"tempbackup" ]]; then
432
-                shred -zu "${1}/*"
432
+                shred -zu "${1}/"*
433
                 rm -rf "${1}"
433
                 rm -rf "${1}"
434
             fi
434
             fi
435
             function_check restart_site
435
             function_check restart_site
459
     backup_directory_to_friend_duplicity "${1}" "${2}"
459
     backup_directory_to_friend_duplicity "${1}" "${2}"
460
 
460
 
461
     if [[ "${1}" == "/root/temp"* || ${1} == *"tempbackup" ]]; then
461
     if [[ "${1}" == "/root/temp"* || ${1} == *"tempbackup" ]]; then
462
-        shred -zu "/root/temp${2}/*"
462
+        shred -zu "/root/temp${2}/"*
463
         rm -rf "/root/temp${2}"
463
         rm -rf "/root/temp${2}"
464
     fi
464
     fi
465
 }
465
 }
510
     if [ -f "${local_database_dir}/${1}.${database_file_extension}" ]; then
510
     if [ -f "${local_database_dir}/${1}.${database_file_extension}" ]; then
511
         if [ ! -s "${local_database_dir}/${1}.${database_file_extension}" ]; then
511
         if [ ! -s "${local_database_dir}/${1}.${database_file_extension}" ]; then
512
             echo $"${1} database could not be saved"
512
             echo $"${1} database could not be saved"
513
-            shred -zu "${local_database_dir}/*"
513
+            shred -zu "${local_database_dir}/"*
514
             rm -rf "${local_database_dir}"
514
             rm -rf "${local_database_dir}"
515
             # Send a warning email
515
             # Send a warning email
516
             echo $"Unable to export ${1} database" | mail -s $"${PROJECT_NAME} backup to friends" "$ADMIN_EMAIL_ADDRESS"
516
             echo $"Unable to export ${1} database" | mail -s $"${PROJECT_NAME} backup to friends" "$ADMIN_EMAIL_ADDRESS"
629
             exit 8735271
629
             exit 8735271
630
         fi
630
         fi
631
         if [ -d "${local_database_dir}/${RESTORE_SUBDIR}/temp${1}data" ]; then
631
         if [ -d "${local_database_dir}/${RESTORE_SUBDIR}/temp${1}data" ]; then
632
-            shred -zu "${local_database_dir}/${RESTORE_SUBDIR}/temp${1}data/*"
632
+            shred -zu "${local_database_dir}/${RESTORE_SUBDIR}/temp${1}data/"*
633
         else
633
         else
634
             shred -zu "${local_database_dir}/*.${database_file_extension}"
634
             shred -zu "${local_database_dir}/*.${database_file_extension}"
635
         fi
635
         fi
653
                 if [ -d "$restore_from_dir" ]; then
653
                 if [ -d "$restore_from_dir" ]; then
654
                     if [ -d "/root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs" ]; then
654
                     if [ -d "/root/temp${1}/${RESTORE_SUBDIR}/www/${2}/htdocs" ]; then
655
                         rm -rf "/var/www/${2}/htdocs"
655
                         rm -rf "/var/www/${2}/htdocs"
656
-                        mv "$restore_from_dir" "/var/www/${2}/"
656
+                        # shellcheck disable=SC2086
657
+                        mv $restore_from_dir /var/www/${2}/
657
                     else
658
                     else
658
-                        cp -r "$restore_from_dir/*" "/var/www/${2}/htdocs/"
659
+                        cp -r "$restore_from_dir/"* "/var/www/${2}/htdocs/"
659
                     fi
660
                     fi
660
                     # shellcheck disable=SC2181
661
                     # shellcheck disable=SC2181
661
                     if [ ! "$?" = "0" ]; then
662
                     if [ ! "$?" = "0" ]; then
738
             exit 482638995
739
             exit 482638995
739
         fi
740
         fi
740
         if [ -d "${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data" ]; then
741
         if [ -d "${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data" ]; then
741
-            shred -zu "${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data/*"
742
+            shred -zu "${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data/"*
742
         else
743
         else
743
             shred -zu "${local_database_dir}/*.${database_file_extension}"
744
             shred -zu "${local_database_dir}/*.${database_file_extension}"
744
         fi
745
         fi
766
                 if [ -d "$restore_from_dir" ]; then
767
                 if [ -d "$restore_from_dir" ]; then
767
                     if [ -d "/root/temp${restore_app_name}/${RESTORE_SUBDIR}/www/${restore_app_domain}/htdocs" ]; then
768
                     if [ -d "/root/temp${restore_app_name}/${RESTORE_SUBDIR}/www/${restore_app_domain}/htdocs" ]; then
768
                         rm -rf "/var/www/${restore_app_domain}/htdocs"
769
                         rm -rf "/var/www/${restore_app_domain}/htdocs"
769
-                        mv "$restore_from_dir" "/var/www/${restore_app_domain}/"
770
+                        # shellcheck disable=SC2086
771
+                        mv $restore_from_dir /var/www/${restore_app_domain}/
770
                     else
772
                     else
771
-                        cp -r "$restore_from_dir/*" "/var/www/${restore_app_domain}/htdocs/"
773
+                        cp -r "$restore_from_dir/"* "/var/www/${restore_app_domain}/htdocs/"
772
                     fi
774
                     fi
773
                     # shellcheck disable=SC2181
775
                     # shellcheck disable=SC2181
774
                     if [ ! "$?" = "0" ]; then
776
                     if [ ! "$?" = "0" ]; then

+ 16
- 10
src/freedombone-utils-gnusocialtools View File

342
     npm install -g whatwg-fetch@2.0.3
342
     npm install -g whatwg-fetch@2.0.3
343
     yarn
343
     yarn
344
     if [ -f "$INSTALL_DIR/pleroma/dist/index.html" ]; then
344
     if [ -f "$INSTALL_DIR/pleroma/dist/index.html" ]; then
345
-        rm -rf "$INSTALL_DIR/pleroma/dist/*"
345
+        rm -rf "$INSTALL_DIR/pleroma/dist/"*
346
     fi
346
     fi
347
     npm run build
347
     npm run build
348
     if [ ! -d "$INSTALL_DIR/pleroma/dist" ]; then
348
     if [ ! -d "$INSTALL_DIR/pleroma/dist" ]; then
355
     fi
355
     fi
356
 
356
 
357
     if [[ "$app_name" != 'pleroma' ]]; then
357
     if [[ "$app_name" != 'pleroma' ]]; then
358
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "/var/www/${pleroma_domain}/htdocs/"
358
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "/var/www/${pleroma_domain}/htdocs/"
359
         pleroma_set_background_image_from_url "/var/www/${pleroma_domain}/htdocs" "$pleroma_domain" "$background_url" "$title"
359
         pleroma_set_background_image_from_url "/var/www/${pleroma_domain}/htdocs" "$pleroma_domain" "$background_url" "$title"
360
     else
360
     else
361
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "$PLEROMA_DIR/priv/static"
361
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "$PLEROMA_DIR/priv/static"
362
         pleroma_set_background_image_from_url "$PLEROMA_DIR/priv/static" "$pleroma_domain" "$background_url" "$title"
362
         pleroma_set_background_image_from_url "$PLEROMA_DIR/priv/static" "$pleroma_domain" "$background_url" "$title"
363
     fi
363
     fi
364
 
364
 
367
     sed -i 's|index index.php;|index index.html;|g' "$nginx_site"
367
     sed -i 's|index index.php;|index index.html;|g' "$nginx_site"
368
 
368
 
369
     if [ -f "/var/www/${pleroma_domain}/htdocs/index.php" ]; then
369
     if [ -f "/var/www/${pleroma_domain}/htdocs/index.php" ]; then
370
-        mv "/var/www/${pleroma_domain}/htdocs/index.php" "/var/www/${pleroma_domain}/htdocs/index_qvitter.php"
370
+        # shellcheck disable=SC2086
371
+        mv /var/www/${pleroma_domain}/htdocs/index.php /var/www/${pleroma_domain}/htdocs/index_qvitter.php
371
     fi
372
     fi
372
     sed -i 's|index.php|index_qvitter.php|g' "$nginx_site"
373
     sed -i 's|index.php|index_qvitter.php|g' "$nginx_site"
373
 
374
 
412
         if [ -f "$basedir/static/config.json" ]; then
413
         if [ -f "$basedir/static/config.json" ]; then
413
             cp "$basedir/static/config.json" "$basedir/static/config.json.old"
414
             cp "$basedir/static/config.json" "$basedir/static/config.json.old"
414
         fi
415
         fi
415
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "$basedir/"
416
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "$basedir/"
416
         if [ -f "$basedir/static/config.json.old" ]; then
417
         if [ -f "$basedir/static/config.json.old" ]; then
417
-            mv "$basedir/static/config.json.old" "$basedir/static/config.json"
418
+            # shellcheck disable=SC2086
419
+            mv $basedir/static/config.json.old $basedir/static/config.json
418
         fi
420
         fi
419
         sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" "$basedir/static/config.json"
421
         sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" "$basedir/static/config.json"
420
         if [ -f "$basedir/static/logo.png.old" ]; then
422
         if [ -f "$basedir/static/logo.png.old" ]; then
425
         fi
427
         fi
426
 
428
 
427
         if [ -f "$basedir/index.php" ]; then
429
         if [ -f "$basedir/index.php" ]; then
428
-            mv "$basedir/index.php" "$basedir/index_qvitter.php"
430
+            # shellcheck disable=SC2086
431
+            mv $basedir/index.php $basedir/index_qvitter.php
429
         fi
432
         fi
430
         chown -R www-data:www-data "$basedir"
433
         chown -R www-data:www-data "$basedir"
431
     else
434
     else
740
     domain_name=$(get_completion_param "$database_name domain")
743
     domain_name=$(get_completion_param "$database_name domain")
741
 
744
 
742
     if [ -f "/var/www/$domain_name/htdocs/index_qvitter.php" ]; then
745
     if [ -f "/var/www/$domain_name/htdocs/index_qvitter.php" ]; then
743
-        mv "/var/www/$domain_name/htdocs/index_qvitter.php" "/var/www/$domain_name/htdocs/index.php"
746
+        # shellcheck disable=SC2086
747
+        mv /var/www/$domain_name/htdocs/index_qvitter.php /var/www/$domain_name/htdocs/index.php
744
     fi
748
     fi
745
 
749
 
746
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
750
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
763
     domain_name=$(get_completion_param "$database_name domain")
767
     domain_name=$(get_completion_param "$database_name domain")
764
 
768
 
765
     if [ -f "/var/www/$domain_name/htdocs/index_qvitter.php" ]; then
769
     if [ -f "/var/www/$domain_name/htdocs/index_qvitter.php" ]; then
766
-        mv "/var/www/$domain_name/htdocs/index_qvitter.php" "/var/www/$domain_name/htdocs/index.php"
770
+        # shellcheck disable=SC2086
771
+        mv /var/www/$domain_name/htdocs/index_qvitter.php /var/www/$domain_name/htdocs/index.php
767
     fi
772
     fi
768
 
773
 
769
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
774
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
793
     fi
798
     fi
794
 
799
 
795
     if [ -f "/var/www/$domain_name/htdocs/index.php" ]; then
800
     if [ -f "/var/www/$domain_name/htdocs/index.php" ]; then
796
-        mv "/var/www/$domain_name/htdocs/index.php" "/var/www/$domain_name/htdocs/index_qvitter.php"
801
+        # shellcheck disable=SC2086
802
+        mv /var/www/$domain_name/htdocs/index.php /var/www/$domain_name/htdocs/index_qvitter.php
797
     fi
803
     fi
798
 
804
 
799
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
805
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then

+ 12
- 2
src/freedombone-utils-go View File

192
         echo 'Go binary not installed'
192
         echo 'Go binary not installed'
193
         exit 763562
193
         exit 763562
194
     fi
194
     fi
195
-    mv "${rootdir}/home/go/go" "${rootdir}/home/go/go${GO_VERSION}"
195
+    # shellcheck disable=SC2086
196
+    mv ${rootdir}/home/go/go ${rootdir}/home/go/go${GO_VERSION}
196
     echo "export GOROOT=/home/go" >> "${rootdir}/root/.bashrc"
197
     echo "export GOROOT=/home/go" >> "${rootdir}/root/.bashrc"
197
     echo "export GOROOT=/home/go" >> "${rootdir}/etc/skel/.bashrc"
198
     echo "export GOROOT=/home/go" >> "${rootdir}/etc/skel/.bashrc"
198
     echo "export GOROOT=/home/go" >> "${rootdir}/home/$MY_USERNAME/.bashrc"
199
     echo "export GOROOT=/home/go" >> "${rootdir}/home/$MY_USERNAME/.bashrc"
209
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
210
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
210
     $prefix chown -R "$MY_USERNAME":"$MY_USERNAME" "/home/$MY_USERNAME"
211
     $prefix chown -R "$MY_USERNAME":"$MY_USERNAME" "/home/$MY_USERNAME"
211
     $prefix chown -R go:go /home/go
212
     $prefix chown -R go:go /home/go
212
-    cp "${rootdir}/home/go/go${GO_VERSION}/bin/*" "${rootdir}/usr/bin"
213
+    if [ ! -d "${rootdir}/home/go/go${GO_VERSION}/bin" ]; then
214
+        echo $"golang binaries directory not found ${rootdir}/home/go/go${GO_VERSION}/bin"
215
+        exit 356356785
216
+    fi
217
+    ls -la "${rootdir}/home/go/go${GO_VERSION}"
218
+    if ! cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"; then
219
+        ls -la "${rootdir}/home/go/go${GO_VERSION}"
220
+        echo $'Copying golang binaries failed'
221
+        exit 246824628
222
+    fi
213
 }
223
 }
214
 
224
 
215
 function upgrade_golang {
225
 function upgrade_golang {

+ 1
- 1
src/freedombone-utils-gpg View File

143
 
143
 
144
     if [[ "$key_username" != 'root' ]]; then
144
     if [[ "$key_username" != 'root' ]]; then
145
         chmod 700 "/home/$key_username/.gnupg"
145
         chmod 700 "/home/$key_username/.gnupg"
146
-        chmod -R 600 "/home/$key_username/.gnupg/*"
146
+        chmod -R 600 "/home/$key_username/.gnupg/"*
147
         printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > "/home/$key_username/.gnupg/S.dirmngr"
147
         printf '%%Assuan%%\nsocket=/dev/shm/S.dirmngr\n' > "/home/$key_username/.gnupg/S.dirmngr"
148
         if [ -d "/home/$key_username/.gnupg/crls.d" ]; then
148
         if [ -d "/home/$key_username/.gnupg/crls.d" ]; then
149
             chmod +x "/home/$key_username/.gnupg/crls.d"
149
             chmod +x "/home/$key_username/.gnupg/crls.d"

+ 5
- 5
src/freedombone-utils-keys View File

85
                 mkdir /etc/letsencrypt
85
                 mkdir /etc/letsencrypt
86
             fi
86
             fi
87
             echo $'Recovering LetsEncrypt keys'
87
             echo $'Recovering LetsEncrypt keys'
88
-            cp -r "$USB_MOUNT/letsencrypt/*" /etc/letsencrypt
88
+            cp -r "$USB_MOUNT/letsencrypt/"* /etc/letsencrypt
89
             addgroup ssl-cert
89
             addgroup ssl-cert
90
             chown -R root:ssl-cert /etc/letsencrypt
90
             chown -R root:ssl-cert /etc/letsencrypt
91
         fi
91
         fi
121
                 fi
121
                 fi
122
                 cp -r "$HOME_DIR/.gnupg $HOME_DIR/.gnupg_old"
122
                 cp -r "$HOME_DIR/.gnupg $HOME_DIR/.gnupg_old"
123
                 chmod 700 "$HOME_DIR/.gnupg_old"
123
                 chmod 700 "$HOME_DIR/.gnupg_old"
124
-                chmod -R 600 "$HOME_DIR/.gnupg_old/*"
124
+                chmod -R 600 "$HOME_DIR/.gnupg_old/"*
125
                 chown -R "$MY_USERNAME":"$MY_USERNAME" "$HOME_DIR/.gnupg_old"
125
                 chown -R "$MY_USERNAME":"$MY_USERNAME" "$HOME_DIR/.gnupg_old"
126
             fi
126
             fi
127
             echo $'Removing old gpg keys'
127
             echo $'Removing old gpg keys'
145
                     mkdir "$HOME_DIR/.gnupg"
145
                     mkdir "$HOME_DIR/.gnupg"
146
                 fi
146
                 fi
147
                 echo $'Recovering GPG keys'
147
                 echo $'Recovering GPG keys'
148
-                cp -r "$USB_MOUNT/.gnupg/*" "$HOME_DIR/.gnupg"
148
+                cp -r "$USB_MOUNT/.gnupg/"* "$HOME_DIR/.gnupg"
149
                 GPG_LOADING="no"
149
                 GPG_LOADING="no"
150
                 dialog --title $"Recover Encryption Keys" \
150
                 dialog --title $"Recover Encryption Keys" \
151
                        --msgbox $"GPG Keyring directory loaded to $HOME_DIR" 6 70
151
                        --msgbox $"GPG Keyring directory loaded to $HOME_DIR" 6 70
154
                 if [ ! -d "$HOME_DIR/.gnupg_fragments" ]; then
154
                 if [ ! -d "$HOME_DIR/.gnupg_fragments" ]; then
155
                     mkdir "$HOME_DIR/.gnupg_fragments"
155
                     mkdir "$HOME_DIR/.gnupg_fragments"
156
                 fi
156
                 fi
157
-                cp -r "$USB_MOUNT/.gnupg_fragments/*" "$HOME_DIR/.gnupg_fragments"
157
+                cp -r "$USB_MOUNT/.gnupg_fragments/"* "$HOME_DIR/.gnupg_fragments"
158
             fi
158
             fi
159
         fi
159
         fi
160
 
160
 
163
                 if [ ! -d "$HOME_DIR/.ssh" ]; then
163
                 if [ ! -d "$HOME_DIR/.ssh" ]; then
164
                     mkdir "$HOME_DIR/.ssh"
164
                     mkdir "$HOME_DIR/.ssh"
165
                 fi
165
                 fi
166
-                cp "$USB_MOUNT/.ssh/*" "$HOME_DIR/.ssh"
166
+                cp "$USB_MOUNT/.ssh/"* "$HOME_DIR/.ssh"
167
                 dialog --title $"Recover Encryption Keys" \
167
                 dialog --title $"Recover Encryption Keys" \
168
                        --msgbox $"ssh keys imported" 6 70
168
                        --msgbox $"ssh keys imported" 6 70
169
                 SSH_IMPORTED="yes"
169
                 SSH_IMPORTED="yes"

+ 2
- 1
src/freedombone-utils-meteor View File

112
         exit 693252
112
         exit 693252
113
     fi
113
     fi
114
 
114
 
115
-    mv "${INSTALL_TMPDIR}/.meteor" "$meteor_dir"
115
+    # shellcheck disable=SC2086
116
+    mv ${INSTALL_TMPDIR}/.meteor $meteor_dir
116
 
117
 
117
     meteor_cleanUp
118
     meteor_cleanUp
118
 
119
 

+ 2
- 2
src/freedombone-utils-onion View File

97
         fi
97
         fi
98
     fi
98
     fi
99
     if [ -d "${HIDDEN_SERVICE_PATH}${onion_service_name}" ]; then
99
     if [ -d "${HIDDEN_SERVICE_PATH}${onion_service_name}" ]; then
100
-        shred -zu "${HIDDEN_SERVICE_PATH}${onion_service_name}/*"
100
+        shred -zu "${HIDDEN_SERVICE_PATH}${onion_service_name}/"*
101
         rm -rf "${HIDDEN_SERVICE_PATH}${onion_service_name}"
101
         rm -rf "${HIDDEN_SERVICE_PATH}${onion_service_name}"
102
     fi
102
     fi
103
     if [ -d "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile" ]; then
103
     if [ -d "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile" ]; then
104
-        shred -zu "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile/*"
104
+        shred -zu "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile/"*
105
         rm -rf "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile"
105
         rm -rf "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile"
106
     fi
106
     fi
107
     remove_completion_param "${onion_service_name} onion domain"
107
     remove_completion_param "${onion_service_name} onion domain"

+ 2
- 1
src/freedombone-utils-rng View File

93
     # Download the package
93
     # Download the package
94
     if [ ! -f $ONERNG_PACKAGE ]; then
94
     if [ ! -f $ONERNG_PACKAGE ]; then
95
         wget "$ONERNG_PACKAGE_DOWNLOAD"
95
         wget "$ONERNG_PACKAGE_DOWNLOAD"
96
-        mv "$ONERNG_PACKAGE?raw=true" $ONERNG_PACKAGE
96
+        # shellcheck disable=SC2086
97
+        mv $ONERNG_PACKAGE?raw=true $ONERNG_PACKAGE
97
     fi
98
     fi
98
     if [ ! -f $ONERNG_PACKAGE ]; then
99
     if [ ! -f $ONERNG_PACKAGE ]; then
99
         echo $"OneRNG package could not be downloaded"
100
         echo $"OneRNG package could not be downloaded"

+ 2
- 2
src/freedombone-utils-web View File

817
             chmod -R 700 /etc/prosody/certs/*
817
             chmod -R 700 /etc/prosody/certs/*
818
             chmod 600 /etc/prosody/prosody.cfg.lua
818
             chmod 600 /etc/prosody/prosody.cfg.lua
819
             if [ -d "$INSTALL_DIR/prosody-modules" ]; then
819
             if [ -d "$INSTALL_DIR/prosody-modules" ]; then
820
-                cp -r "$INSTALL_DIR/prosody-modules/*" /var/lib/prosody/prosody-modules/
821
-                cp -r "$INSTALL_DIR/prosody-modules/*" /usr/lib/prosody/modules/
820
+                cp -r "$INSTALL_DIR/prosody-modules/"* /var/lib/prosody/prosody-modules/
821
+                cp -r "$INSTALL_DIR/prosody-modules/"* /usr/lib/prosody/modules/
822
             fi
822
             fi
823
             chown -R prosody:prosody /var/lib/prosody/prosody-modules
823
             chown -R prosody:prosody /var/lib/prosody/prosody-modules
824
             chown -R prosody:prosody /usr/lib/prosody/modules
824
             chown -R prosody:prosody /usr/lib/prosody/modules