Przeglądaj źródła

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

Bob Mottram 7 lat temu
rodzic
commit
3efe97a70f
56 zmienionych plików z 219 dodań i 162 usunięć
  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 Wyświetl plik

@@ -245,10 +245,12 @@ function add_cert_letsencrypt {
245 245
 
246 246
     # replace some legacy filenames
247 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 250
     fi
250 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 254
     fi
253 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 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,7 +258,8 @@ function add_cert_letsencrypt {
256 258
     # link the private key
257 259
     if [ -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key" ]; then
258 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 263
         else
261 264
             rm -f "/etc/ssl/private/${LETSENCRYPT_HOSTNAME}.key"
262 265
         fi
@@ -269,7 +272,8 @@ function add_cert_letsencrypt {
269 272
     # link the public key
270 273
     if [ -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem" ]; then
271 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 277
         else
274 278
             rm -f "/etc/ssl/certs/${LETSENCRYPT_HOSTNAME}.pem"
275 279
         fi

+ 1
- 1
src/freedombone-adduser Wyświetl plik

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

+ 4
- 4
src/freedombone-app-dokuwiki Wyświetl plik

@@ -154,9 +154,9 @@ function restore_local_dokuwiki {
154 154
     function_check restore_directory_from_usb
155 155
     restore_directory_from_usb ${temp_restore_dir} dokuwikidat
156 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 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 160
     fi
161 161
     # shellcheck disable=SC2181
162 162
     if [ ! "$?" = "0" ]; then
@@ -219,7 +219,7 @@ function restore_remote_dokuwiki {
219 219
         temp_restore_dir=/root/tempdokuwikidat
220 220
         restore_directory_from_friend $temp_restore_dir dokuwikidat
221 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 223
         else
224 224
             cp -r $temp_restore_dir/* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/data/"
225 225
         fi
@@ -237,7 +237,7 @@ function restore_remote_dokuwiki {
237 237
         temp_restore_dir=/root/tempdokuwikiacl
238 238
         restore_directory_from_friend $temp_restore_dir dokuwikiacl
239 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 241
         else
242 242
             cp -r $temp_restore_dir/* "/var/www/$DOKUWIKI_DOMAIN_NAME/htdocs/lib/plugins/acl/"
243 243
         fi

+ 2
- 2
src/freedombone-app-emacs Wyświetl plik

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

+ 2
- 1
src/freedombone-app-etherpad Wyświetl plik

@@ -607,7 +607,8 @@ function install_etherpad {
607 607
     create_site_certificate "$ETHERPAD_DOMAIN_NAME" 'yes'
608 608
 
609 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 612
     fi
612 613
     if [ -f "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem" ]; then
613 614
         chown etherpad: "/etc/ssl/certs/${ETHERPAD_DOMAIN_NAME}.pem"

+ 4
- 3
src/freedombone-app-friendica Wyświetl plik

@@ -258,7 +258,7 @@ function restore_local_friendica {
258 258
             mkdir -p "$friendica_dir/store/[data]/smarty3"
259 259
         fi
260 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 262
         if [ -d $temp_restore_dir ]; then
263 263
             rm -rf $temp_restore_dir
264 264
         fi
@@ -297,7 +297,7 @@ function restore_remote_friendica {
297 297
             mkdir -p "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
298 298
         fi
299 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 301
     fi
302 302
     if [ -d /root/tempfriendica ]; then
303 303
         rm -rf /root/tempfriendica
@@ -380,7 +380,8 @@ function install_friendica {
380 380
         set_completion_param "friendica commit" "$FRIENDICA_COMMIT"
381 381
 
382 382
         rm -rf "$FRIENDICA_PATH"
383
-        mv friendica "$FRIENDICA_PATH"
383
+        # shellcheck disable=SC2086
384
+        mv friendica $FRIENDICA_PATH
384 385
 
385 386
         git_clone "$FRIENDICA_ADDONS_REPO" "$FRIENDICA_PATH/addon"
386 387
         cd "$FRIENDICA_PATH/addon" || exit 34835685

+ 5
- 5
src/freedombone-app-ghost Wyświetl plik

@@ -260,7 +260,7 @@ function restore_local_ghost {
260 260
         restore_directory_from_usb $temp_restore_dir ghostcontent
261 261
         if [ -d $temp_restore_dir ]; then
262 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 264
             else
265 265
                 if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
266 266
                     mkdir "/var/www/$GHOST_DOMAIN_NAME/htdocs/content"
@@ -276,7 +276,7 @@ function restore_local_ghost {
276 276
         restore_directory_from_usb $temp_restore_dir ghostcurrent
277 277
         if [ -d $temp_restore_dir ]; then
278 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 280
             else
281 281
                 if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
282 282
                     mkdir -p "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content"
@@ -335,7 +335,7 @@ function restore_remote_ghost {
335 335
     restore_directory_from_friend $temp_restore_dir ghostcontent
336 336
     if [ -d $temp_restore_dir ]; then
337 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 339
         else
340 340
             if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/content" ]; then
341 341
                 mkdir "/var/www/$GHOST_DOMAIN_NAME/htdocs/content"
@@ -351,7 +351,7 @@ function restore_remote_ghost {
351 351
     restore_directory_from_friend $temp_restore_dir ghostcurrent
352 352
     if [ -d $temp_restore_dir ]; then
353 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 355
         else
356 356
             if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content" ]; then
357 357
                 mkdir -p "/var/www/$GHOST_DOMAIN_NAME/htdocs/current/content"
@@ -441,7 +441,7 @@ function install_ghost {
441 441
     yarn install --no-emoji --no-progress
442 442
     yarn cache clean
443 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 445
     printf 'y' | ghost install ${GHOST_VERSION} --user ghost --db=sqlite3 --port ${GHOST_PORT} --verbose
446 446
 
447 447
     if [ ! -d "/var/www/$GHOST_DOMAIN_NAME/htdocs/versions" ]; then

+ 6
- 5
src/freedombone-app-gnusocial Wyświetl plik

@@ -360,7 +360,8 @@ function upgrade_gnusocial {
360 360
 
361 361
     if [ -f "/var/www/${GNUSOCIAL_DOMAIN_NAME}/htdocs/index_qvitter.php" ]; then
362 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 365
         fi
365 366
     fi
366 367
 
@@ -444,7 +445,7 @@ function restore_local_gnusocial {
444 445
                 if [ ! -d "$gnusocial_dir/static" ]; then
445 446
                     mkdir "$gnusocial_dir/static"
446 447
                 fi
447
-                cp -rp "$temp_restore_dir/static/*" "$gnusocial_dir/static/"
448
+                cp -rp "$temp_restore_dir/static/"* "$gnusocial_dir/static/"
448 449
             fi
449 450
             chown www-data:www-data "$gnusocial_dir/config.php"
450 451
             chown -R www-data:www-data "$gnusocial_dir/static"
@@ -459,7 +460,7 @@ function restore_local_gnusocial {
459 460
                 if [ ! -d "$gnusocial_dir/file" ]; then
460 461
                     mkdir "$gnusocial_dir/file"
461 462
                 fi
462
-                cp -rp "$temp_restore_dir/*" "$gnusocial_dir/file"
463
+                cp -rp "$temp_restore_dir/"* "$gnusocial_dir/file"
463 464
             fi
464 465
             chown -R www-data:www-data "$gnusocial_dir/file"
465 466
             rm -rf "$temp_restore_dir"
@@ -540,7 +541,7 @@ function restore_remote_gnusocial {
540 541
                 if [ ! -d "$gnusocial_dir/static" ]; then
541 542
                     mkdir "$gnusocial_dir/static"
542 543
                 fi
543
-                cp -rp "$temp_restore_dir/static/*" "$gnusocial_dir/static/"
544
+                cp -rp "$temp_restore_dir/static/"* "$gnusocial_dir/static/"
544 545
             fi
545 546
             chown www-data:www-data "$gnusocial_dir/config.php"
546 547
             chown -R www-data:www-data "$gnusocial_dir/static"
@@ -555,7 +556,7 @@ function restore_remote_gnusocial {
555 556
                 if [ ! -d "$gnusocial_dir/file" ]; then
556 557
                     mkdir "$gnusocial_dir/file"
557 558
                 fi
558
-                cp -rp "$temp_restore_dir/*" "$gnusocial_dir/file/"
559
+                cp -rp "$temp_restore_dir/"* "$gnusocial_dir/file/"
559 560
             fi
560 561
             chown -R www-data:www-data "$gnusocial_dir/file"
561 562
             rm -rf $temp_restore_dir

+ 11
- 8
src/freedombone-app-gogs Wyświetl plik

@@ -166,7 +166,8 @@ function upgrade_gogs {
166 166
         rm -rf "$INSTALL_DIR/gogs-repositories"
167 167
     fi
168 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 171
     fi
171 172
 
172 173
     gogs_parameters
@@ -202,7 +203,7 @@ function upgrade_gogs {
202 203
         exit 37823
203 204
     fi
204 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 207
     if [ -f ${GOGS_FILE} ]; then
207 208
         rm ${GOGS_FILE}
208 209
     fi
@@ -221,7 +222,8 @@ function upgrade_gogs {
221 222
         rm -rf /home/${GOGS_USERNAME}/gogs-repositories
222 223
     fi
223 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 227
     fi
226 228
     chown -R "${GOGS_USERNAME}":"${GOGS_USERNAME}" "/home/${GOGS_USERNAME}"
227 229
 
@@ -273,9 +275,9 @@ function restore_local_gogs {
273 275
                 mkdir -p $GOGS_CONFIG_PATH
274 276
             fi
275 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 279
             else
278
-                cp -r "/root/tempgogs/*" "/home/${GOGS_USERNAME}/custom/"
280
+                cp -r "/root/tempgogs/"* "/home/${GOGS_USERNAME}/custom/"
279 281
             fi
280 282
             # shellcheck disable=SC2181
281 283
             if [ ! "$?" = "0" ]; then
@@ -292,9 +294,9 @@ function restore_local_gogs {
292 294
                 mkdir "/home/${GOGS_USERNAME}/gogs-repositories"
293 295
             fi
294 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 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 300
             fi
299 301
             # shellcheck disable=SC2181
300 302
             if [ ! "$?" = "0" ]; then
@@ -351,6 +353,7 @@ function backup_remote_gogs {
351 353
 
352 354
         echo $"Obtaining Gogs repos backup"
353 355
 
356
+        # shellcheck disable=SC2086
354 357
         mv /home/$GOGS_USERNAME/gogs-repositories/*.git /home/$GOGS_USERNAME/gogs-repositories/bob
355 358
         backup_directory_to_friend /home/$GOGS_USERNAME/gogs-repositories gogsrepos
356 359
 
@@ -508,7 +511,7 @@ function install_gogs {
508 511
         exit 37823
509 512
     fi
510 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 515
     if [ -f ${GOGS_FILE} ]; then
513 516
         rm ${GOGS_FILE}
514 517
     fi

+ 14
- 8
src/freedombone-app-htmly Wyświetl plik

@@ -247,7 +247,8 @@ function restore_local_htmly {
247 247
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
248 248
                 rm -rf "/var/www/${HTMLY_DOMAIN_NAME}/previous"
249 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 252
         fi
252 253
         if [ -d "${temp_restore_dir}/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
253 254
             temp_source_dir=$(find ${temp_restore_dir} -name htdocs)
@@ -256,12 +257,13 @@ function restore_local_htmly {
256 257
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
257 258
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
258 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 261
         fi
261 262
         # shellcheck disable=SC2181
262 263
         if [ ! "$?" = "0" ]; then
263 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 267
             fi
266 268
             set_user_permissions
267 269
             backup_unmount_drive
@@ -283,7 +285,8 @@ function restore_local_htmly {
283 285
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
284 286
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
285 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 290
                 fi
288 291
             fi
289 292
         done
@@ -321,7 +324,8 @@ function restore_remote_htmly {
321 324
             if [ -d "/var/www/${HTMLY_DOMAIN_NAME}/previous" ]; then
322 325
                 rm -rf "/var/www/${HTMLY_DOMAIN_NAME}/previous"
323 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 329
         fi
326 330
 
327 331
         if [ -d "${temp_restore_dir}/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
@@ -331,13 +335,14 @@ function restore_remote_htmly {
331 335
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
332 336
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
333 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 339
         fi
336 340
 
337 341
         # shellcheck disable=SC2181
338 342
         if [ ! "$?" = "0" ]; then
339 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 346
             fi
342 347
             exit 593
343 348
         fi
@@ -354,7 +359,8 @@ function restore_remote_htmly {
354 359
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
355 360
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
356 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 364
                 fi
359 365
             fi
360 366
         done

+ 3
- 3
src/freedombone-app-hubzilla Wyświetl plik

@@ -220,7 +220,7 @@ function upgrade_hubzilla {
220 220
         git merge --abort
221 221
         git stash
222 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 224
         chown -R www-data:www-data "$HUBZILLA_PATH"
225 225
     fi
226 226
 }
@@ -248,7 +248,7 @@ function restore_local_hubzilla {
248 248
             mkdir -p "$hubzilla_dir/store/[data]/smarty3"
249 249
         fi
250 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 252
         if [ -d $temp_restore_dir ]; then
253 253
             rm -rf $temp_restore_dir
254 254
         fi
@@ -287,7 +287,7 @@ function restore_remote_hubzilla {
287 287
             mkdir -p "/var/www/${HUBZILLA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
288 288
         fi
289 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 291
     fi
292 292
     if [ -d /root/temphubzilla ]; then
293 293
         rm -rf /root/temphubzilla

+ 4
- 3
src/freedombone-app-icecast Wyświetl plik

@@ -213,7 +213,8 @@ function icecast_import_from_directory {
213 213
     fi
214 214
 
215 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 219
     icecast_convert_files "$ICECAST_DIR/$dest_dir"
219 220
     icecast_add_file_to_playlist "$ICECAST_DIR/$dest_dir"
@@ -236,7 +237,7 @@ function icecast_import_from_usb {
236 237
         dialog --title $"Import stream files from USB drive" --msgbox $'No stream files directory found on USB drive' 6 50
237 238
         backup_unmount_drive "${USB_DRIVE}"
238 239
     fi
239
-    cp -ru "$USB_MOUNT$ICECAST_DIR/*" $ICECAST_DIR
240
+    cp -ru "$USB_MOUNT$ICECAST_DIR/"* $ICECAST_DIR
240 241
     backup_unmount_drive "${USB_DRIVE}"
241 242
     icecast_convert_files $ICECAST_DIR
242 243
     dialog --title $"Import stream files from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
@@ -255,7 +256,7 @@ function icecast_export_to_usb {
255 256
     if [ ! -d "$USB_MOUNT$ICECAST_DIR" ]; then
256 257
         mkdir -p "$USB_MOUNT$ICECAST_DIR"
257 258
     fi
258
-    cp -ru "$ICECAST_DIR/*" "$USB_MOUNT$ICECAST_DIR"
259
+    cp -ru "$ICECAST_DIR/"* "$USB_MOUNT$ICECAST_DIR"
259 260
     backup_unmount_drive "${USB_DRIVE}"
260 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 Wyświetl plik

@@ -120,9 +120,9 @@ function restore_local_ipfs {
120 120
         restore_directory_from_usb $temp_restore_dir ipfs
121 121
         ADMIN_USERNAME=$(get_completion_param "Admin user")
122 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 124
         else
125
-            cp -rf "$temp_restore_dir/*" "/home/$ADMIN_USERNAME/.ipfs"
125
+            cp -rf "$temp_restore_dir/"* "/home/$ADMIN_USERNAME/.ipfs"
126 126
         fi
127 127
         # shellcheck disable=SC2181
128 128
         if [ ! "$?" = "0" ]; then
@@ -157,9 +157,9 @@ function restore_remote_ipfs {
157 157
         function_check restore_directory_from_friend
158 158
         restore_directory_from_friend $temp_restore_dir ipfs
159 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 161
         else
162
-            cp -rf "$temp_restore_dir/*" "/home/$ADMIN_USERNAME/.ipfs"
162
+            cp -rf "$temp_restore_dir/"* "/home/$ADMIN_USERNAME/.ipfs"
163 163
         fi
164 164
         # shellcheck disable=SC2181
165 165
         if [ ! "$?" = "0" ]; then

+ 2
- 2
src/freedombone-app-kanboard Wyświetl plik

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

+ 4
- 3
src/freedombone-app-koel Wyświetl plik

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

+ 3
- 2
src/freedombone-app-matrix Wyświetl plik

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

+ 2
- 2
src/freedombone-app-mediagoblin Wyświetl plik

@@ -230,9 +230,9 @@ function restore_remote_mediagoblin {
230 230
         function_check restore_directory_from_friend
231 231
         restore_directory_from_friend $temp_restore_dir mediagoblin
232 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 234
         else
235
-            cp -r "${temp_restore_dir}/*" "$MEDIAGOBLIN_BASE_DIR/"
235
+            cp -r "${temp_restore_dir}/"* "$MEDIAGOBLIN_BASE_DIR/"
236 236
         fi
237 237
         # shellcheck disable=SC2181
238 238
         if [ ! "$?" = "0" ]; then

+ 2
- 1
src/freedombone-app-nextcloud Wyświetl plik

@@ -692,7 +692,8 @@ function install_nextcloud_main {
692 692
     systemctl restart mariadb
693 693
 
694 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 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 699
     set_completion_param "nextcloud domain" "$NEXTCLOUD_DOMAIN_NAME"

+ 2
- 1
src/freedombone-app-pelican Wyświetl plik

@@ -222,7 +222,8 @@ function pelican_new_blog {
222 222
 
223 223
     # move to the content directory
224 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 228
     # increment the index
228 229
     CURRENT_INDEX=$((CURRENT_INDEX + 1))

+ 1
- 1
src/freedombone-app-pihole Wyświetl plik

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

+ 1
- 1
src/freedombone-app-pleroma Wyświetl plik

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

+ 6
- 5
src/freedombone-app-postactiv Wyświetl plik

@@ -373,7 +373,8 @@ function upgrade_postactiv {
373 373
 
374 374
     if [ -f "/var/www/${POSTACTIV_DOMAIN_NAME}/htdocs/index_qvitter.php" ]; then
375 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 378
         fi
378 379
     fi
379 380
 
@@ -459,7 +460,7 @@ function restore_local_postactiv {
459 460
                 if [ ! -d "$postactiv_dir/static" ]; then
460 461
                     mkdir "$postactiv_dir/static"
461 462
                 fi
462
-                cp -rp "$temp_restore_dir/static/*" "$postactiv_dir/static/"
463
+                cp -rp "$temp_restore_dir/static/"* "$postactiv_dir/static/"
463 464
             fi
464 465
             chown www-data:www-data "$postactiv_dir/config.php"
465 466
             chown -R www-data:www-data "$postactiv_dir/static"
@@ -474,7 +475,7 @@ function restore_local_postactiv {
474 475
                 if [ ! -d "$postactiv_dir/file" ]; then
475 476
                     mkdir "$postactiv_dir/file"
476 477
                 fi
477
-                cp -rp "$temp_restore_dir/*" "$postactiv_dir/file/"
478
+                cp -rp "$temp_restore_dir/"* "$postactiv_dir/file/"
478 479
             fi
479 480
             chown -R www-data:www-data "$postactiv_dir/file"
480 481
             rm -rf $temp_restore_dir
@@ -555,7 +556,7 @@ function restore_remote_postactiv {
555 556
                 if [ ! -d "$postactiv_dir/static" ]; then
556 557
                     mkdir "$postactiv_dir/static"
557 558
                 fi
558
-                cp -rp "$temp_restore_dir/static/*" "$postactiv_dir/static/"
559
+                cp -rp "$temp_restore_dir/static/"* "$postactiv_dir/static/"
559 560
             fi
560 561
             chown www-data:www-data "$postactiv_dir/config.php"
561 562
             chown -R www-data:www-data "$postactiv_dir/static"
@@ -570,7 +571,7 @@ function restore_remote_postactiv {
570 571
                 if [ ! -d "$postactiv_dir/file" ]; then
571 572
                     mkdir "$postactiv_dir/file"
572 573
                 fi
573
-                cp -rp "$temp_restore_dir/*" "$postactiv_dir/file/"
574
+                cp -rp "$temp_restore_dir/"* "$postactiv_dir/file/"
574 575
             fi
575 576
             chown -R www-data:www-data "$postactiv_dir/file"
576 577
             rm -rf $temp_restore_dir

+ 4
- 4
src/freedombone-app-privatebin Wyświetl plik

@@ -205,9 +205,9 @@ function restore_local_privatebin {
205 205
         restore_directory_from_usb $temp_restore_dir privatebin
206 206
         if [ -d $temp_restore_dir ]; then
207 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 209
             else
210
-                cp -rp "$temp_restore_dir/*" "$privatebin_dir/"
210
+                cp -rp "$temp_restore_dir/"* "$privatebin_dir/"
211 211
             fi
212 212
             secure_privatebin
213 213
             rm -rf $temp_restore_dir
@@ -249,9 +249,9 @@ function restore_remote_privatebin {
249 249
         restore_directory_from_friend $temp_restore_dir privatebin
250 250
         if [ -d $temp_restore_dir ]; then
251 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 253
             else
254
-                cp -rp "$temp_restore_dir/*" "$privatebin_dir/"
254
+                cp -rp "$temp_restore_dir/"* "$privatebin_dir/"
255 255
             fi
256 256
             secure_privatebin
257 257
             rm -rf $temp_restore_dir

+ 1
- 1
src/freedombone-app-riot Wyświetl plik

@@ -155,7 +155,7 @@ function riot_download {
155 155
         echo $'Unable to extract Riot Web tarball'
156 156
         exit 542826
157 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 160
     chown -R www-data:www-data "/var/www/$RIOT_DOMAIN_NAME/htdocs"
161 161
 }

+ 2
- 2
src/freedombone-app-syncthing Wyświetl plik

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

+ 2
- 1
src/freedombone-app-tahoelafs Wyświetl plik

@@ -355,7 +355,8 @@ function restore_remote_tahoelafs {
355 355
     # shellcheck disable=SC2181
356 356
     if [ ! "$?" = "0" ]; then
357 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 360
         fi
360 361
         exit 623925
361 362
     fi

+ 2
- 2
src/freedombone-app-tox Wyświetl plik

@@ -76,10 +76,10 @@ function remove_user_tox {
76 76
 
77 77
     if [ -d "/home/$remove_username/.config/tox" ]; then
78 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 80
             rm -rf "/home/$remove_username/.config/tox/chatlogs"
81 81
         fi
82
-        shred -zu "/home/$remove_username/.config/tox/*"
82
+        shred -zu "/home/$remove_username/.config/tox/"*
83 83
     fi
84 84
 }
85 85
 

+ 4
- 4
src/freedombone-app-vim Wyświetl plik

@@ -106,7 +106,7 @@ function restore_local_vim {
106 106
                     if [ ! -d "/home/$USERNAME/$VIM_TEMP_DIR" ]; then
107 107
                         mkdir "/home/$USERNAME/$VIM_TEMP_DIR"
108 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 110
                 fi
111 111
                 # shellcheck disable=SC2181
112 112
                 if [ ! "$?" = "0" ]; then
@@ -117,7 +117,7 @@ function restore_local_vim {
117 117
                     backup_unmount_drive
118 118
                     exit 664
119 119
                 fi
120
-                cp "/home/$USERNAME/$VIM_TEMP_DIR/*" "/home/$USERNAME"
120
+                cp "/home/$USERNAME/$VIM_TEMP_DIR/"* "/home/$USERNAME"
121 121
                 if [ -f "/home/$USERNAME/.viminfo" ]; then
122 122
                     chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.viminfo"
123 123
                 fi
@@ -182,7 +182,7 @@ function restore_remote_vim {
182 182
                     if [ ! -d "/home/$USERNAME/$VIM_TEMP_DIR" ]; then
183 183
                         mkdir "/home/$USERNAME/$VIM_TEMP_DIR"
184 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 186
                 fi
187 187
                 # shellcheck disable=SC2181
188 188
                 if [ ! "$?" = "0" ]; then
@@ -193,7 +193,7 @@ function restore_remote_vim {
193 193
                     backup_unmount_drive
194 194
                     exit 664
195 195
                 fi
196
-                cp "/home/$USERNAME/$VIM_TEMP_DIR/*" "/home/$USERNAME"
196
+                cp "/home/$USERNAME/$VIM_TEMP_DIR/"* "/home/$USERNAME"
197 197
                 if [ -f "/home/$USERNAME/.viminfo" ]; then
198 198
                     chown "$USERNAME":"$USERNAME" "/home/$USERNAME/.viminfo"
199 199
                 fi

+ 3
- 3
src/freedombone-app-xmpp Wyświetl plik

@@ -380,8 +380,8 @@ function update_prosody_modules {
380 380
                     if [ ! -d /var/lib/prosody/prosody-modules ]; then
381 381
                         mkdir -p /var/lib/prosody/prosody-modules
382 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 385
                     chown -R prosody:prosody /var/lib/prosody/prosody-modules
386 386
                     chown -R prosody:prosody /usr/lib/prosody/modules
387 387
                     systemctl start prosody
@@ -505,7 +505,7 @@ function upgrade_xmpp {
505 505
         set_completion_param "prosody_filename" "${prosody_filename}"
506 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 509
     chown -R prosody:prosody /var/lib/prosody/prosody-modules
510 510
 
511 511
     systemctl restart prosody

+ 3
- 3
src/freedombone-app-zeronet Wyświetl plik

@@ -203,7 +203,7 @@ function install_zeronet_blog {
203 203
 
204 204
     echo $"ZeroNet Blog address:     $ZERONET_BLOG_ADDRESS"
205 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 208
     if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data" ]; then
209 209
         mkdir "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_BLOG_ADDRESS/data"
@@ -286,7 +286,7 @@ function install_zeronet_mail {
286 286
 
287 287
     echo $"ZeroNet Mail address:     $ZERONET_MAIL_ADDRESS"
288 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 291
     if [ ! -d "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data" ]; then
292 292
         mkdir "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_MAIL_ADDRESS/data"
@@ -368,7 +368,7 @@ function install_zeronet_forum {
368 368
 
369 369
     echo $"Forum address:     $ZERONET_FORUM_ADDRESS"
370 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 372
     sed -i "s/ZeroBoard/$ZERONET_DEFAULT_FORUM_TITLE/g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
373 373
     sed -i "s/ZeroTalk/$ZERONET_DEFAULT_FORUM_TITLE/g" "$MESH_INSTALL_DIR/zeronet/data/$ZERONET_FORUM_ADDRESS/index.html"
374 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 Wyświetl plik

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

+ 2
- 2
src/freedombone-base-email Wyświetl plik

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

+ 2
- 1
src/freedombone-client Wyświetl plik

@@ -107,7 +107,8 @@ function refresh_gpg_keys {
107 107
 function ssh_remove_small_moduli {
108 108
     # shellcheck disable=SC2024
109 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 114
 function configure_ssh_client {

+ 6
- 3
src/freedombone-clientcert Wyświetl plik

@@ -137,11 +137,14 @@ fi
137 137
 
138 138
 # move the cert to the user's home
139 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 142
 cp "/etc/ssl/certs/dovecot.crt" "/home/$USERNAME/emailcert"
142 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 148
 openssl pkcs12 -export -in "/home/$USERNAME/emailcert/$USERNAME.cer" \
146 149
         -out "/home/$USERNAME/emailcert/$USERNAME.p12" \
147 150
         -inkey "/home/$USERNAME/emailcert/$USERNAME.key" \

+ 5
- 3
src/freedombone-controlpanel Wyświetl plik

@@ -1343,8 +1343,10 @@ function reset_tripwire {
1343 1343
     fi
1344 1344
     if [ ! -f "/etc/tripwire/${HOSTNAME}-local.key" ]; then
1345 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 1350
         else
1349 1351
             echo $'Error: missing local key'
1350 1352
             any_key
@@ -2153,7 +2155,7 @@ function add_clacks {
2153 2155
             clacks=$(<"$data")
2154 2156
             if [ ${#clacks} -gt 1 ]; then
2155 2157
 
2156
-                WEB_FILES="/etc/nginx/sites-available/*"
2158
+                WEB_FILES="/etc/nginx/sites-available/"*
2157 2159
                 for f in $WEB_FILES
2158 2160
                 do
2159 2161
                     if grep -q "X-Clacks-Overhead" "$f"; then

+ 7
- 4
src/freedombone-image Wyświetl plik

@@ -243,7 +243,7 @@ function image_setup {
243 243
             makepkg --force --noconfirm
244 244
             makepkg -i --force --noconfirm
245 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 247
             if [ ! -f "/usr/share/debootstrap/scripts/${DEBIAN_VERSION}" ]; then
248 248
                 echo $"No debian debootstrap script was found for $DEBIAN_VERSION"
249 249
                 return
@@ -490,7 +490,8 @@ do
490 490
         if [ ! -d "${CURR_DIR}/build" ]; then
491 491
             mkdir "${CURR_DIR}/build"
492 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 495
     fi
495 496
 done
496 497
 
@@ -628,8 +629,10 @@ do
628 629
     # shellcheck disable=SC2012,SC2086
629 630
     no_of_files=$(ls -afq build/${PROJECT_NAME}*.${im} | wc -l)
630 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 636
     fi
634 637
 done
635 638
 

+ 3
- 2
src/freedombone-image-customise Wyświetl plik

@@ -1798,7 +1798,8 @@ function image_setup_utils {
1798 1798
         echo 'Go binary not installed'
1799 1799
         exit 763562
1800 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 1803
     echo "export GOROOT=/home/go" >> "${rootdir}/root/.bashrc"
1803 1804
     echo "export GOROOT=/home/go" >> "${rootdir}/etc/skel/.bashrc"
1804 1805
     echo "export GOROOT=/home/go" >> "${rootdir}/home/go/.bashrc"
@@ -1809,7 +1810,7 @@ function image_setup_utils {
1809 1810
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/etc/skel/.bashrc"
1810 1811
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
1811 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 1815
     # Tomb
1815 1816
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses

+ 3
- 3
src/freedombone-image-hardware-setup Wyświetl plik

@@ -207,7 +207,7 @@ EOF
207 207
 
208 208
     # Copy all DTBs
209 209
     mkdir -p /boot/dtbs
210
-    cp "/usr/lib/$kernelVersion/*" /boot/dtbs
210
+    cp "/usr/lib/$kernelVersion/"* /boot/dtbs
211 211
 
212 212
     # extra boot modules
213 213
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules
@@ -218,7 +218,7 @@ setup_flash_kernel() {
218 218
     if [ ! -d /etc/flash-kernel ] ; then
219 219
        mkdir /etc/flash-kernel
220 220
     fi
221
-    echo "$1" > /etc/flash-kernel/machine
221
+    printf "%s" "$1" > /etc/flash-kernel/machine
222 222
 
223 223
     command_line=""
224 224
     if [ -n "$2" ] ; then
@@ -226,7 +226,7 @@ setup_flash_kernel() {
226 226
     fi
227 227
 
228 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 230
     fi
231 231
 
232 232
     apt-get install -y flash-kernel

+ 3
- 2
src/freedombone-image-make Wyświetl plik

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

+ 1
- 1
src/freedombone-image-mesh Wyświetl plik

@@ -843,7 +843,7 @@ function show_desktop_icons {
843 843
 
844 844
     # set permissions
845 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 847
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config"
848 848
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/tox"
849 849
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/autostart"

+ 2
- 1
src/freedombone-mesh-blog Wyświetl plik

@@ -125,7 +125,8 @@ function new_blog {
125 125
 
126 126
     # move to the content directory
127 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 131
     # increment the index
131 132
     CURRENT_INDEX=$((CURRENT_INDEX + 1))

+ 1
- 1
src/freedombone-pass Wyświetl plik

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

+ 1
- 1
src/freedombone-recoverkey Wyświetl plik

@@ -123,7 +123,7 @@ if [ "$FRIENDS_SERVERS_LIST" ]; then
123 123
 
124 124
             echo -n $"Starting key retrieval from $REMOTE_SERVER..."
125 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 127
             # shellcheck disable=SC2181
128 128
             if [ ! "$?" = "0" ]; then
129 129
                 echo $'FAILED'

+ 5
- 4
src/freedombone-restore-local Wyświetl plik

@@ -561,7 +561,7 @@ function restore_spamassassin {
561 561
                     if [ ! -d "/home/$USERNAME/.spamassassin" ]; then
562 562
                         mkdir "/home/$USERNAME/.spamassassin"
563 563
                     fi
564
-                        cp -rf "$temp_restore_dir/*" "/home/$USERNAME/.spamassassin/"
564
+                        cp -rf "$temp_restore_dir/"* "/home/$USERNAME/.spamassassin/"
565 565
                     fi
566 566
                     # shellcheck disable=SC2181
567 567
                     if [ ! "$?" = "0" ]; then
@@ -634,7 +634,7 @@ function restore_user_ssh_keys {
634 634
                     if [ ! -d "/home/$USERNAME/.ssh" ]; then
635 635
                         mkdir "/home/$USERNAME/.ssh"
636 636
                     fi
637
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.ssh/"
637
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.ssh/"
638 638
                 fi
639 639
                 # shellcheck disable=SC2181
640 640
                 if [ ! "$?" = "0" ]; then
@@ -753,7 +753,7 @@ function restore_user_fin {
753 753
                     if [ ! -d "/home/$USERNAME/.fin" ]; then
754 754
                         mkdir "/home/$USERNAME/.fin"
755 755
                     fi
756
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.fin/"
756
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.fin/"
757 757
                 fi
758 758
                 # shellcheck disable=SC2181
759 759
                 if [ ! "$?" = "0" ]; then
@@ -876,7 +876,8 @@ function restore_personal_settings {
876 876
                         rm -rf "/home/$USERNAME/personal"
877 877
                     fi
878 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 881
                     else
881 882
                         if [ ! -d "/home/$USERNAME/personal" ]; then
882 883
                             mkdir "/home/$USERNAME/personal"

+ 4
- 3
src/freedombone-restore-remote Wyświetl plik

@@ -432,7 +432,7 @@ function restore_gpg {
432 432
                     if [ ! -d "/home/$USERNAME/.gnupg" ]; then
433 433
                         mkdir "/home/$USERNAME/.gnupg"
434 434
                     fi
435
-                    cp -r "${temp_restore_dir}/*" "/home/$USERNAME/.gnupg/"
435
+                    cp -r "${temp_restore_dir}/"* "/home/$USERNAME/.gnupg/"
436 436
                 fi
437 437
                 # shellcheck disable=SC2181
438 438
                 if [ ! "$?" = "0" ]; then
@@ -599,7 +599,7 @@ function restore_user_config {
599 599
                     if [ ! -d "/home/$USERNAME/.config" ]; then
600 600
                         mkdir "/home/$USERNAME/.config"
601 601
                     fi
602
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.config/"
602
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.config/"
603 603
                 fi
604 604
                 # shellcheck disable=SC2181
605 605
                 if [ ! "$?" = "0" ]; then
@@ -792,7 +792,8 @@ function restore_personal_settings {
792 792
                     if [ -d "/home/$USERNAME/personal" ]; then
793 793
                         rm -rf "/home/$USERNAME/personal"
794 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 797
                 else
797 798
                     if [ ! -d "/home/$USERNAME/personal" ]; then
798 799
                         mkdir "/home/$USERNAME/personal"

+ 2
- 2
src/freedombone-rmuser Wyświetl plik

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

+ 1
- 1
src/freedombone-upgrade Wyświetl plik

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

+ 16
- 14
src/freedombone-utils-backup Wyświetl plik

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

+ 16
- 10
src/freedombone-utils-gnusocialtools Wyświetl plik

@@ -342,7 +342,7 @@ function install_pleroma_front_end {
342 342
     npm install -g whatwg-fetch@2.0.3
343 343
     yarn
344 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 346
     fi
347 347
     npm run build
348 348
     if [ ! -d "$INSTALL_DIR/pleroma/dist" ]; then
@@ -355,10 +355,10 @@ function install_pleroma_front_end {
355 355
     fi
356 356
 
357 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 359
         pleroma_set_background_image_from_url "/var/www/${pleroma_domain}/htdocs" "$pleroma_domain" "$background_url" "$title"
360 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 362
         pleroma_set_background_image_from_url "$PLEROMA_DIR/priv/static" "$pleroma_domain" "$background_url" "$title"
363 363
     fi
364 364
 
@@ -367,7 +367,8 @@ function install_pleroma_front_end {
367 367
     sed -i 's|index index.php;|index index.html;|g' "$nginx_site"
368 368
 
369 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 372
     fi
372 373
     sed -i 's|index.php|index_qvitter.php|g' "$nginx_site"
373 374
 
@@ -412,9 +413,10 @@ function upgrade_pleroma_frontend {
412 413
         if [ -f "$basedir/static/config.json" ]; then
413 414
             cp "$basedir/static/config.json" "$basedir/static/config.json.old"
414 415
         fi
415
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "$basedir/"
416
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "$basedir/"
416 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 420
         fi
419 421
         sed -i "s|\"name\":.*|\"name\": \"${title}\",|g" "$basedir/static/config.json"
420 422
         if [ -f "$basedir/static/logo.png.old" ]; then
@@ -425,7 +427,8 @@ function upgrade_pleroma_frontend {
425 427
         fi
426 428
 
427 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 432
         fi
430 433
         chown -R www-data:www-data "$basedir"
431 434
     else
@@ -740,7 +743,8 @@ function gnusocial_use_classic {
740 743
     domain_name=$(get_completion_param "$database_name domain")
741 744
 
742 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 748
     fi
745 749
 
746 750
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
@@ -763,7 +767,8 @@ function gnusocial_use_qvitter {
763 767
     domain_name=$(get_completion_param "$database_name domain")
764 768
 
765 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 772
     fi
768 773
 
769 774
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then
@@ -793,7 +798,8 @@ function gnusocial_use_pleroma {
793 798
     fi
794 799
 
795 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 803
     fi
798 804
 
799 805
     if [ -f "/etc/nginx/sites-available/$domain_name" ]; then

+ 12
- 2
src/freedombone-utils-go Wyświetl plik

@@ -192,7 +192,8 @@ function mesh_upgrade_golang {
192 192
         echo 'Go binary not installed'
193 193
         exit 763562
194 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 197
     echo "export GOROOT=/home/go" >> "${rootdir}/root/.bashrc"
197 198
     echo "export GOROOT=/home/go" >> "${rootdir}/etc/skel/.bashrc"
198 199
     echo "export GOROOT=/home/go" >> "${rootdir}/home/$MY_USERNAME/.bashrc"
@@ -209,7 +210,16 @@ function mesh_upgrade_golang {
209 210
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
210 211
     $prefix chown -R "$MY_USERNAME":"$MY_USERNAME" "/home/$MY_USERNAME"
211 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 225
 function upgrade_golang {

+ 1
- 1
src/freedombone-utils-gpg Wyświetl plik

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

+ 5
- 5
src/freedombone-utils-keys Wyświetl plik

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

+ 2
- 1
src/freedombone-utils-meteor Wyświetl plik

@@ -112,7 +112,8 @@ function install_meteor_script {
112 112
         exit 693252
113 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 118
     meteor_cleanUp
118 119
 

+ 2
- 2
src/freedombone-utils-onion Wyświetl plik

@@ -97,11 +97,11 @@ function remove_onion_service {
97 97
         fi
98 98
     fi
99 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 101
         rm -rf "${HIDDEN_SERVICE_PATH}${onion_service_name}"
102 102
     fi
103 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 105
         rm -rf "${HIDDEN_SERVICE_PATH}${onion_service_name}_mobile"
106 106
     fi
107 107
     remove_completion_param "${onion_service_name} onion domain"

+ 2
- 1
src/freedombone-utils-rng Wyświetl plik

@@ -93,7 +93,8 @@ function install_onerng {
93 93
     # Download the package
94 94
     if [ ! -f $ONERNG_PACKAGE ]; then
95 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 98
     fi
98 99
     if [ ! -f $ONERNG_PACKAGE ]; then
99 100
         echo $"OneRNG package could not be downloaded"

+ 2
- 2
src/freedombone-utils-web Wyświetl plik

@@ -817,8 +817,8 @@ function update_default_domain {
817 817
             chmod -R 700 /etc/prosody/certs/*
818 818
             chmod 600 /etc/prosody/prosody.cfg.lua
819 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 822
             fi
823 823
             chown -R prosody:prosody /var/lib/prosody/prosody-modules
824 824
             chown -R prosody:prosody /usr/lib/prosody/modules