ソースを参照

quotes with wildcard

Bob Mottram 7 年 前
コミット
369a297a77
共有43 個のファイルを変更した112 個の追加112 個の削除を含む
  1. 1
    1
      src/freedombone-adduser
  2. 4
    4
      src/freedombone-app-dokuwiki
  3. 2
    2
      src/freedombone-app-emacs
  4. 2
    2
      src/freedombone-app-friendica
  5. 5
    5
      src/freedombone-app-ghost
  6. 4
    4
      src/freedombone-app-gnusocial
  7. 6
    6
      src/freedombone-app-gogs
  8. 4
    4
      src/freedombone-app-htmly
  9. 3
    3
      src/freedombone-app-hubzilla
  10. 2
    2
      src/freedombone-app-icecast
  11. 4
    4
      src/freedombone-app-ipfs
  12. 2
    2
      src/freedombone-app-kanboard
  13. 2
    2
      src/freedombone-app-koel
  14. 1
    1
      src/freedombone-app-matrix
  15. 2
    2
      src/freedombone-app-mediagoblin
  16. 1
    1
      src/freedombone-app-pihole
  17. 1
    1
      src/freedombone-app-pleroma
  18. 4
    4
      src/freedombone-app-postactiv
  19. 4
    4
      src/freedombone-app-privatebin
  20. 1
    1
      src/freedombone-app-riot
  21. 2
    2
      src/freedombone-app-syncthing
  22. 2
    2
      src/freedombone-app-tox
  23. 4
    4
      src/freedombone-app-vim
  24. 3
    3
      src/freedombone-app-xmpp
  25. 3
    3
      src/freedombone-app-zeronet
  26. 1
    1
      src/freedombone-backup-remote
  27. 2
    2
      src/freedombone-base-email
  28. 1
    1
      src/freedombone-controlpanel
  29. 1
    1
      src/freedombone-image-customise
  30. 1
    1
      src/freedombone-image-hardware-setup
  31. 1
    1
      src/freedombone-image-mesh
  32. 1
    1
      src/freedombone-pass
  33. 1
    1
      src/freedombone-recoverkey
  34. 3
    3
      src/freedombone-restore-local
  35. 2
    2
      src/freedombone-restore-remote
  36. 2
    2
      src/freedombone-rmuser
  37. 1
    1
      src/freedombone-upgrade
  38. 12
    12
      src/freedombone-utils-backup
  39. 4
    4
      src/freedombone-utils-gnusocialtools
  40. 1
    1
      src/freedombone-utils-gpg
  41. 5
    5
      src/freedombone-utils-keys
  42. 2
    2
      src/freedombone-utils-onion
  43. 2
    2
      src/freedombone-utils-web

+ 1
- 1
src/freedombone-adduser ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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
- 2
src/freedombone-app-friendica ファイルの表示

@@ -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

+ 5
- 5
src/freedombone-app-ghost ファイルの表示

@@ -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

+ 4
- 4
src/freedombone-app-gnusocial ファイルの表示

@@ -444,7 +444,7 @@ function restore_local_gnusocial {
444 444
                 if [ ! -d "$gnusocial_dir/static" ]; then
445 445
                     mkdir "$gnusocial_dir/static"
446 446
                 fi
447
-                cp -rp "$temp_restore_dir/static/*" "$gnusocial_dir/static/"
447
+                cp -rp "$temp_restore_dir/static/"* "$gnusocial_dir/static/"
448 448
             fi
449 449
             chown www-data:www-data "$gnusocial_dir/config.php"
450 450
             chown -R www-data:www-data "$gnusocial_dir/static"
@@ -459,7 +459,7 @@ function restore_local_gnusocial {
459 459
                 if [ ! -d "$gnusocial_dir/file" ]; then
460 460
                     mkdir "$gnusocial_dir/file"
461 461
                 fi
462
-                cp -rp "$temp_restore_dir/*" "$gnusocial_dir/file"
462
+                cp -rp "$temp_restore_dir/"* "$gnusocial_dir/file"
463 463
             fi
464 464
             chown -R www-data:www-data "$gnusocial_dir/file"
465 465
             rm -rf "$temp_restore_dir"
@@ -540,7 +540,7 @@ function restore_remote_gnusocial {
540 540
                 if [ ! -d "$gnusocial_dir/static" ]; then
541 541
                     mkdir "$gnusocial_dir/static"
542 542
                 fi
543
-                cp -rp "$temp_restore_dir/static/*" "$gnusocial_dir/static/"
543
+                cp -rp "$temp_restore_dir/static/"* "$gnusocial_dir/static/"
544 544
             fi
545 545
             chown www-data:www-data "$gnusocial_dir/config.php"
546 546
             chown -R www-data:www-data "$gnusocial_dir/static"
@@ -555,7 +555,7 @@ function restore_remote_gnusocial {
555 555
                 if [ ! -d "$gnusocial_dir/file" ]; then
556 556
                     mkdir "$gnusocial_dir/file"
557 557
                 fi
558
-                cp -rp "$temp_restore_dir/*" "$gnusocial_dir/file/"
558
+                cp -rp "$temp_restore_dir/"* "$gnusocial_dir/file/"
559 559
             fi
560 560
             chown -R www-data:www-data "$gnusocial_dir/file"
561 561
             rm -rf $temp_restore_dir

+ 6
- 6
src/freedombone-app-gogs ファイルの表示

@@ -202,7 +202,7 @@ function upgrade_gogs {
202 202
         exit 37823
203 203
     fi
204 204
     rm -rf "/home/${GOGS_USERNAME:?}/"*
205
-    cp -r "${INSTALL_DIR}/gogs/*" "/home/${GOGS_USERNAME}"
205
+    cp -r "${INSTALL_DIR}/gogs/"* "/home/${GOGS_USERNAME}"
206 206
     if [ -f ${GOGS_FILE} ]; then
207 207
         rm ${GOGS_FILE}
208 208
     fi
@@ -273,9 +273,9 @@ function restore_local_gogs {
273 273
                 mkdir -p $GOGS_CONFIG_PATH
274 274
             fi
275 275
             if [ -d "/root/tempgogs/home/${GOGS_USERNAME}/custom" ]; then
276
-                cp -r "/root/tempgogs/home/${GOGS_USERNAME}/custom/*" "/home/${GOGS_USERNAME}/custom/"
276
+                cp -r "/root/tempgogs/home/${GOGS_USERNAME}/custom/"* "/home/${GOGS_USERNAME}/custom/"
277 277
             else
278
-                cp -r "/root/tempgogs/*" "/home/${GOGS_USERNAME}/custom/"
278
+                cp -r "/root/tempgogs/"* "/home/${GOGS_USERNAME}/custom/"
279 279
             fi
280 280
             # shellcheck disable=SC2181
281 281
             if [ ! "$?" = "0" ]; then
@@ -292,9 +292,9 @@ function restore_local_gogs {
292 292
                 mkdir "/home/${GOGS_USERNAME}/gogs-repositories"
293 293
             fi
294 294
             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/"
295
+                cp -r "${temp_restore_dir}repos/home/${GOGS_USERNAME}/gogs-repositories/"* "/home/${GOGS_USERNAME}/gogs-repositories/"
296 296
             else
297
-                cp -r "${temp_restore_dir}repos/*" "/home/${GOGS_USERNAME}/gogs-repositories/"
297
+                cp -r "${temp_restore_dir}repos/"* "/home/${GOGS_USERNAME}/gogs-repositories/"
298 298
             fi
299 299
             # shellcheck disable=SC2181
300 300
             if [ ! "$?" = "0" ]; then
@@ -508,7 +508,7 @@ function install_gogs {
508 508
         exit 37823
509 509
     fi
510 510
     rm -rf "/home/${GOGS_USERNAME:?}/"*
511
-    cp -r "${INSTALL_DIR}/gogs/*" "/home/${GOGS_USERNAME}"
511
+    cp -r "${INSTALL_DIR}/gogs/"* "/home/${GOGS_USERNAME}"
512 512
     if [ -f ${GOGS_FILE} ]; then
513 513
         rm ${GOGS_FILE}
514 514
     fi

+ 4
- 4
src/freedombone-app-htmly ファイルの表示

@@ -256,7 +256,7 @@ function restore_local_htmly {
256 256
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
257 257
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
258 258
             fi
259
-            cp -r "${temp_restore_dir}/*" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
259
+            cp -r "${temp_restore_dir}/"* "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
260 260
         fi
261 261
         # shellcheck disable=SC2181
262 262
         if [ ! "$?" = "0" ]; then
@@ -283,7 +283,7 @@ function restore_local_htmly {
283 283
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
284 284
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
285 285
                 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"
286
+                    mv "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/"*.md "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post"
287 287
                 fi
288 288
             fi
289 289
         done
@@ -331,7 +331,7 @@ function restore_remote_htmly {
331 331
             if [ ! -d "/var/www/${HTMLY_DOMAIN_NAME}/htdocs" ]; then
332 332
                 mkdir "/var/www/${HTMLY_DOMAIN_NAME}/htdocs"
333 333
             fi
334
-            cp -r "${temp_restore_dir}/*" "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
334
+            cp -r "${temp_restore_dir}/"* "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/"
335 335
         fi
336 336
 
337 337
         # shellcheck disable=SC2181
@@ -354,7 +354,7 @@ function restore_remote_htmly {
354 354
             USERNAME=$(echo "$d" | awk -F '/' '{print $3}')
355 355
             if [[ $(is_valid_user "$USERNAME") == "1" ]]; then
356 356
                 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"
357
+                    mv "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/"*.md "/var/www/${HTMLY_DOMAIN_NAME}/htdocs/content/$USERNAME/htmly/uncategorized/post"
358 358
                 fi
359 359
             fi
360 360
         done

+ 3
- 3
src/freedombone-app-hubzilla ファイルの表示

@@ -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

+ 2
- 2
src/freedombone-app-icecast ファイルの表示

@@ -236,7 +236,7 @@ function icecast_import_from_usb {
236 236
         dialog --title $"Import stream files from USB drive" --msgbox $'No stream files directory found on USB drive' 6 50
237 237
         backup_unmount_drive "${USB_DRIVE}"
238 238
     fi
239
-    cp -ru "$USB_MOUNT$ICECAST_DIR/*" $ICECAST_DIR
239
+    cp -ru "$USB_MOUNT$ICECAST_DIR/"* $ICECAST_DIR
240 240
     backup_unmount_drive "${USB_DRIVE}"
241 241
     icecast_convert_files $ICECAST_DIR
242 242
     dialog --title $"Import stream files from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
@@ -255,7 +255,7 @@ function icecast_export_to_usb {
255 255
     if [ ! -d "$USB_MOUNT$ICECAST_DIR" ]; then
256 256
         mkdir -p "$USB_MOUNT$ICECAST_DIR"
257 257
     fi
258
-    cp -ru "$ICECAST_DIR/*" "$USB_MOUNT$ICECAST_DIR"
258
+    cp -ru "$ICECAST_DIR/"* "$USB_MOUNT$ICECAST_DIR"
259 259
     backup_unmount_drive "${USB_DRIVE}"
260 260
     dialog --title $"Export stream files to USB drive" --msgbox $'Export complete. You may now remove the USB drive' 6 50
261 261
 }

+ 4
- 4
src/freedombone-app-ipfs ファイルの表示

@@ -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 ファイルの表示

@@ -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

+ 2
- 2
src/freedombone-app-koel ファイルの表示

@@ -226,7 +226,7 @@ function koel_import_from_usb {
226 226
         dialog --title $"Import music from USB drive" --msgbox $'No Music directory found on USB drive' 6 50
227 227
         backup_unmount_drive "${USB_DRIVE}"
228 228
     fi
229
-    cp -ru "$USB_MOUNT/Music/*" /music
229
+    cp -ru "$USB_MOUNT/Music/"* /music
230 230
     backup_unmount_drive "${USB_DRIVE}"
231 231
     dialog --title $"Import music from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
232 232
 }
@@ -320,7 +320,7 @@ function upgrade_koel {
320 320
     cd "/var/www/${KOEL_DOMAIN_NAME}/htdocs" || exit 7345346358
321 321
     php artisan koel:init
322 322
     koel_remove_gravatar
323
-    chown -R www-data:www-data "/var/www/${KOEL_DOMAIN_NAME}/htdocs/*"
323
+    chown -R www-data:www-data "/var/www/${KOEL_DOMAIN_NAME}/htdocs/"*
324 324
 
325 325
     systemctl start koel
326 326
 }

+ 1
- 1
src/freedombone-app-matrix ファイルの表示

@@ -634,7 +634,7 @@ function install_home_server {
634 634
     fi
635 635
     rm -rf /usr/local/lib/python2.7/dist-packages/ldap*
636 636
     if [ -d "$INSTALL_DIR/matrix" ]; then
637
-        rm -rf "$INSTALL_DIR/matrix/*"
637
+        rm -rf "$INSTALL_DIR/matrix/"*
638 638
     fi
639 639
     if ! pip install --upgrade --process-dependency-links . -b "$INSTALL_DIR/matrix"; then
640 640
         echo $'Failed to install matrix home server'

+ 2
- 2
src/freedombone-app-mediagoblin ファイルの表示

@@ -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

+ 1
- 1
src/freedombone-app-pihole ファイルの表示

@@ -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 ファイルの表示

@@ -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

+ 4
- 4
src/freedombone-app-postactiv ファイルの表示

@@ -459,7 +459,7 @@ function restore_local_postactiv {
459 459
                 if [ ! -d "$postactiv_dir/static" ]; then
460 460
                     mkdir "$postactiv_dir/static"
461 461
                 fi
462
-                cp -rp "$temp_restore_dir/static/*" "$postactiv_dir/static/"
462
+                cp -rp "$temp_restore_dir/static/"* "$postactiv_dir/static/"
463 463
             fi
464 464
             chown www-data:www-data "$postactiv_dir/config.php"
465 465
             chown -R www-data:www-data "$postactiv_dir/static"
@@ -474,7 +474,7 @@ function restore_local_postactiv {
474 474
                 if [ ! -d "$postactiv_dir/file" ]; then
475 475
                     mkdir "$postactiv_dir/file"
476 476
                 fi
477
-                cp -rp "$temp_restore_dir/*" "$postactiv_dir/file/"
477
+                cp -rp "$temp_restore_dir/"* "$postactiv_dir/file/"
478 478
             fi
479 479
             chown -R www-data:www-data "$postactiv_dir/file"
480 480
             rm -rf $temp_restore_dir
@@ -555,7 +555,7 @@ function restore_remote_postactiv {
555 555
                 if [ ! -d "$postactiv_dir/static" ]; then
556 556
                     mkdir "$postactiv_dir/static"
557 557
                 fi
558
-                cp -rp "$temp_restore_dir/static/*" "$postactiv_dir/static/"
558
+                cp -rp "$temp_restore_dir/static/"* "$postactiv_dir/static/"
559 559
             fi
560 560
             chown www-data:www-data "$postactiv_dir/config.php"
561 561
             chown -R www-data:www-data "$postactiv_dir/static"
@@ -570,7 +570,7 @@ function restore_remote_postactiv {
570 570
                 if [ ! -d "$postactiv_dir/file" ]; then
571 571
                     mkdir "$postactiv_dir/file"
572 572
                 fi
573
-                cp -rp "$temp_restore_dir/*" "$postactiv_dir/file/"
573
+                cp -rp "$temp_restore_dir/"* "$postactiv_dir/file/"
574 574
             fi
575 575
             chown -R www-data:www-data "$postactiv_dir/file"
576 576
             rm -rf $temp_restore_dir

+ 4
- 4
src/freedombone-app-privatebin ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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
- 2
src/freedombone-app-tox ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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 ファイルの表示

@@ -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"

+ 1
- 1
src/freedombone-controlpanel ファイルの表示

@@ -2153,7 +2153,7 @@ function add_clacks {
2153 2153
             clacks=$(<"$data")
2154 2154
             if [ ${#clacks} -gt 1 ]; then
2155 2155
 
2156
-                WEB_FILES="/etc/nginx/sites-available/*"
2156
+                WEB_FILES="/etc/nginx/sites-available/"*
2157 2157
                 for f in $WEB_FILES
2158 2158
                 do
2159 2159
                     if grep -q "X-Clacks-Overhead" "$f"; then

+ 1
- 1
src/freedombone-image-customise ファイルの表示

@@ -1809,7 +1809,7 @@ function image_setup_utils {
1809 1809
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/etc/skel/.bashrc"
1810 1810
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
1811 1811
     chroot "$rootdir" chown -R go:go /home/go
1812
-    cp "${rootdir}/home/go/go${GO_VERSION}/bin/*" "${rootdir}/usr/bin"
1812
+    cp "${rootdir}/home/go/go${GO_VERSION}/bin/"* "${rootdir}/usr/bin"
1813 1813
 
1814 1814
     # Tomb
1815 1815
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses

+ 1
- 1
src/freedombone-image-hardware-setup ファイルの表示

@@ -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

+ 1
- 1
src/freedombone-image-mesh ファイルの表示

@@ -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"

+ 1
- 1
src/freedombone-pass ファイルの表示

@@ -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 ファイルの表示

@@ -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'

+ 3
- 3
src/freedombone-restore-local ファイルの表示

@@ -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

+ 2
- 2
src/freedombone-restore-remote ファイルの表示

@@ -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

+ 2
- 2
src/freedombone-rmuser ファイルの表示

@@ -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 ファイルの表示

@@ -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

+ 12
- 12
src/freedombone-utils-backup ファイルの表示

@@ -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
@@ -655,7 +655,7 @@ function restore_database_from_friend {
655 655
                         rm -rf "/var/www/${2}/htdocs"
656 656
                         mv "$restore_from_dir" "/var/www/${2}/"
657 657
                     else
658
-                        cp -r "$restore_from_dir/*" "/var/www/${2}/htdocs/"
658
+                        cp -r "$restore_from_dir/"* "/var/www/${2}/htdocs/"
659 659
                     fi
660 660
                     # shellcheck disable=SC2181
661 661
                     if [ ! "$?" = "0" ]; then
@@ -738,7 +738,7 @@ function restore_database {
738 738
             exit 482638995
739 739
         fi
740 740
         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/*"
741
+            shred -zu "${local_database_dir}/${RESTORE_SUBDIR}/temp${restore_app_name}data/"*
742 742
         else
743 743
             shred -zu "${local_database_dir}/*.${database_file_extension}"
744 744
         fi
@@ -768,7 +768,7 @@ function restore_database {
768 768
                         rm -rf "/var/www/${restore_app_domain}/htdocs"
769 769
                         mv "$restore_from_dir" "/var/www/${restore_app_domain}/"
770 770
                     else
771
-                        cp -r "$restore_from_dir/*" "/var/www/${restore_app_domain}/htdocs/"
771
+                        cp -r "$restore_from_dir/"* "/var/www/${restore_app_domain}/htdocs/"
772 772
                     fi
773 773
                     # shellcheck disable=SC2181
774 774
                     if [ ! "$?" = "0" ]; then

+ 4
- 4
src/freedombone-utils-gnusocialtools ファイルの表示

@@ -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
 
@@ -412,7 +412,7 @@ function upgrade_pleroma_frontend {
412 412
         if [ -f "$basedir/static/config.json" ]; then
413 413
             cp "$basedir/static/config.json" "$basedir/static/config.json.old"
414 414
         fi
415
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "$basedir/"
415
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "$basedir/"
416 416
         if [ -f "$basedir/static/config.json.old" ]; then
417 417
             mv "$basedir/static/config.json.old" "$basedir/static/config.json"
418 418
         fi

+ 1
- 1
src/freedombone-utils-gpg ファイルの表示

@@ -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 ファイルの表示

@@ -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
- 2
src/freedombone-utils-onion ファイルの表示

@@ -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
- 2
src/freedombone-utils-web ファイルの表示

@@ -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