浏览代码

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

+ 4
- 4
src/freedombone-app-dokuwiki 查看文件

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

+ 2
- 2
src/freedombone-app-emacs 查看文件

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

+ 2
- 2
src/freedombone-app-friendica 查看文件

258
             mkdir -p "$friendica_dir/store/[data]/smarty3"
258
             mkdir -p "$friendica_dir/store/[data]/smarty3"
259
         fi
259
         fi
260
         chmod 1777 "$friendica_dir/store/[data]/smarty3"
260
         chmod 1777 "$friendica_dir/store/[data]/smarty3"
261
-        chown -R www-data:www-data "$friendica_dir/*"
261
+        chown -R www-data:www-data "$friendica_dir/"*
262
         if [ -d $temp_restore_dir ]; then
262
         if [ -d $temp_restore_dir ]; then
263
             rm -rf $temp_restore_dir
263
             rm -rf $temp_restore_dir
264
         fi
264
         fi
297
             mkdir -p "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
297
             mkdir -p "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
298
         fi
298
         fi
299
         chmod 1777 "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
299
         chmod 1777 "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/store/[data]/smarty3"
300
-        chown -R www-data:www-data "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/*"
300
+        chown -R www-data:www-data "/var/www/${FRIENDICA_DOMAIN_NAME}/htdocs/"*
301
     fi
301
     fi
302
     if [ -d /root/tempfriendica ]; then
302
     if [ -d /root/tempfriendica ]; then
303
         rm -rf /root/tempfriendica
303
         rm -rf /root/tempfriendica

+ 5
- 5
src/freedombone-app-ghost 查看文件

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

+ 4
- 4
src/freedombone-app-gnusocial 查看文件

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

+ 6
- 6
src/freedombone-app-gogs 查看文件

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

+ 4
- 4
src/freedombone-app-htmly 查看文件

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

+ 3
- 3
src/freedombone-app-hubzilla 查看文件

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

+ 2
- 2
src/freedombone-app-icecast 查看文件

236
         dialog --title $"Import stream files from USB drive" --msgbox $'No stream files directory found on USB drive' 6 50
236
         dialog --title $"Import stream files from USB drive" --msgbox $'No stream files directory found on USB drive' 6 50
237
         backup_unmount_drive "${USB_DRIVE}"
237
         backup_unmount_drive "${USB_DRIVE}"
238
     fi
238
     fi
239
-    cp -ru "$USB_MOUNT$ICECAST_DIR/*" $ICECAST_DIR
239
+    cp -ru "$USB_MOUNT$ICECAST_DIR/"* $ICECAST_DIR
240
     backup_unmount_drive "${USB_DRIVE}"
240
     backup_unmount_drive "${USB_DRIVE}"
241
     icecast_convert_files $ICECAST_DIR
241
     icecast_convert_files $ICECAST_DIR
242
     dialog --title $"Import stream files from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
242
     dialog --title $"Import stream files from USB drive" --msgbox $'Import complete. You may now remove the USB drive' 6 50
255
     if [ ! -d "$USB_MOUNT$ICECAST_DIR" ]; then
255
     if [ ! -d "$USB_MOUNT$ICECAST_DIR" ]; then
256
         mkdir -p "$USB_MOUNT$ICECAST_DIR"
256
         mkdir -p "$USB_MOUNT$ICECAST_DIR"
257
     fi
257
     fi
258
-    cp -ru "$ICECAST_DIR/*" "$USB_MOUNT$ICECAST_DIR"
258
+    cp -ru "$ICECAST_DIR/"* "$USB_MOUNT$ICECAST_DIR"
259
     backup_unmount_drive "${USB_DRIVE}"
259
     backup_unmount_drive "${USB_DRIVE}"
260
     dialog --title $"Export stream files to USB drive" --msgbox $'Export complete. You may now remove the USB drive' 6 50
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
         restore_directory_from_usb $temp_restore_dir ipfs
120
         restore_directory_from_usb $temp_restore_dir ipfs
121
         ADMIN_USERNAME=$(get_completion_param "Admin user")
121
         ADMIN_USERNAME=$(get_completion_param "Admin user")
122
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
122
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
123
-            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/*" "/home/$ADMIN_USERNAME/.ipfs"
123
+            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/"* "/home/$ADMIN_USERNAME/.ipfs"
124
         else
124
         else
125
-            cp -rf "$temp_restore_dir/*" "/home/$ADMIN_USERNAME/.ipfs"
125
+            cp -rf "$temp_restore_dir/"* "/home/$ADMIN_USERNAME/.ipfs"
126
         fi
126
         fi
127
         # shellcheck disable=SC2181
127
         # shellcheck disable=SC2181
128
         if [ ! "$?" = "0" ]; then
128
         if [ ! "$?" = "0" ]; then
157
         function_check restore_directory_from_friend
157
         function_check restore_directory_from_friend
158
         restore_directory_from_friend $temp_restore_dir ipfs
158
         restore_directory_from_friend $temp_restore_dir ipfs
159
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
159
         if [ -d "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs" ]; then
160
-            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/*" "/home/$ADMIN_USERNAME/.ipfs"
160
+            cp -rf "$temp_restore_dir/home/$ADMIN_USERNAME/.ipfs/"* "/home/$ADMIN_USERNAME/.ipfs"
161
         else
161
         else
162
-            cp -rf "$temp_restore_dir/*" "/home/$ADMIN_USERNAME/.ipfs"
162
+            cp -rf "$temp_restore_dir/"* "/home/$ADMIN_USERNAME/.ipfs"
163
         fi
163
         fi
164
         # shellcheck disable=SC2181
164
         # shellcheck disable=SC2181
165
         if [ ! "$?" = "0" ]; then
165
         if [ ! "$?" = "0" ]; then

+ 2
- 2
src/freedombone-app-kanboard 查看文件

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

+ 2
- 2
src/freedombone-app-koel 查看文件

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

+ 1
- 1
src/freedombone-app-matrix 查看文件

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

+ 2
- 2
src/freedombone-app-mediagoblin 查看文件

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

+ 1
- 1
src/freedombone-app-pihole 查看文件

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

+ 1
- 1
src/freedombone-app-pleroma 查看文件

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

+ 4
- 4
src/freedombone-app-postactiv 查看文件

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

+ 4
- 4
src/freedombone-app-privatebin 查看文件

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

+ 1
- 1
src/freedombone-app-riot 查看文件

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

+ 2
- 2
src/freedombone-app-syncthing 查看文件

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

+ 2
- 2
src/freedombone-app-tox 查看文件

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

+ 4
- 4
src/freedombone-app-vim 查看文件

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

+ 3
- 3
src/freedombone-app-xmpp 查看文件

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

+ 3
- 3
src/freedombone-app-zeronet 查看文件

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

+ 1
- 1
src/freedombone-backup-remote 查看文件

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

+ 2
- 2
src/freedombone-base-email 查看文件

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

+ 1
- 1
src/freedombone-controlpanel 查看文件

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

+ 1
- 1
src/freedombone-image-customise 查看文件

1809
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/etc/skel/.bashrc"
1809
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/etc/skel/.bashrc"
1810
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
1810
     echo "export PATH=\$PATH:\$GOPATH" >> "${rootdir}/home/go/.bashrc"
1811
     chroot "$rootdir" chown -R go:go /home/go
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
     # Tomb
1814
     # Tomb
1815
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses
1815
     chroot "$rootdir" apt-get -yq install zsh pinentry-curses

+ 1
- 1
src/freedombone-image-hardware-setup 查看文件

207
 
207
 
208
     # Copy all DTBs
208
     # Copy all DTBs
209
     mkdir -p /boot/dtbs
209
     mkdir -p /boot/dtbs
210
-    cp "/usr/lib/$kernelVersion/*" /boot/dtbs
210
+    cp "/usr/lib/$kernelVersion/"* /boot/dtbs
211
 
211
 
212
     # extra boot modules
212
     # extra boot modules
213
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules
213
     echo "rtc_sunxi" >> /etc/initramfs-tools/modules

+ 1
- 1
src/freedombone-image-mesh 查看文件

843
 
843
 
844
     # set permissions
844
     # set permissions
845
     chmod +x "/home/$MY_USERNAME/Desktop/*.desktop"
845
     chmod +x "/home/$MY_USERNAME/Desktop/*.desktop"
846
-    chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/Desktop/*"
846
+    chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/Desktop/"*
847
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config"
847
     chown "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config"
848
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/tox"
848
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/tox"
849
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/autostart"
849
     chown -R "${MY_USERNAME}":"${MY_USERNAME}" "/home/$MY_USERNAME/.config/autostart"

+ 1
- 1
src/freedombone-pass 查看文件

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

+ 1
- 1
src/freedombone-recoverkey 查看文件

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

+ 3
- 3
src/freedombone-restore-local 查看文件

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

+ 2
- 2
src/freedombone-restore-remote 查看文件

432
                     if [ ! -d "/home/$USERNAME/.gnupg" ]; then
432
                     if [ ! -d "/home/$USERNAME/.gnupg" ]; then
433
                         mkdir "/home/$USERNAME/.gnupg"
433
                         mkdir "/home/$USERNAME/.gnupg"
434
                     fi
434
                     fi
435
-                    cp -r "${temp_restore_dir}/*" "/home/$USERNAME/.gnupg/"
435
+                    cp -r "${temp_restore_dir}/"* "/home/$USERNAME/.gnupg/"
436
                 fi
436
                 fi
437
                 # shellcheck disable=SC2181
437
                 # shellcheck disable=SC2181
438
                 if [ ! "$?" = "0" ]; then
438
                 if [ ! "$?" = "0" ]; then
599
                     if [ ! -d "/home/$USERNAME/.config" ]; then
599
                     if [ ! -d "/home/$USERNAME/.config" ]; then
600
                         mkdir "/home/$USERNAME/.config"
600
                         mkdir "/home/$USERNAME/.config"
601
                     fi
601
                     fi
602
-                    cp -r "$temp_restore_dir/*" "/home/$USERNAME/.config/"
602
+                    cp -r "$temp_restore_dir/"* "/home/$USERNAME/.config/"
603
                 fi
603
                 fi
604
                 # shellcheck disable=SC2181
604
                 # shellcheck disable=SC2181
605
                 if [ ! "$?" = "0" ]; then
605
                 if [ ! "$?" = "0" ]; then

+ 2
- 2
src/freedombone-rmuser 查看文件

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

+ 1
- 1
src/freedombone-upgrade 查看文件

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

+ 12
- 12
src/freedombone-utils-backup 查看文件

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

+ 4
- 4
src/freedombone-utils-gnusocialtools 查看文件

342
     npm install -g whatwg-fetch@2.0.3
342
     npm install -g whatwg-fetch@2.0.3
343
     yarn
343
     yarn
344
     if [ -f "$INSTALL_DIR/pleroma/dist/index.html" ]; then
344
     if [ -f "$INSTALL_DIR/pleroma/dist/index.html" ]; then
345
-        rm -rf "$INSTALL_DIR/pleroma/dist/*"
345
+        rm -rf "$INSTALL_DIR/pleroma/dist/"*
346
     fi
346
     fi
347
     npm run build
347
     npm run build
348
     if [ ! -d "$INSTALL_DIR/pleroma/dist" ]; then
348
     if [ ! -d "$INSTALL_DIR/pleroma/dist" ]; then
355
     fi
355
     fi
356
 
356
 
357
     if [[ "$app_name" != 'pleroma' ]]; then
357
     if [[ "$app_name" != 'pleroma' ]]; then
358
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "/var/www/${pleroma_domain}/htdocs/"
358
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "/var/www/${pleroma_domain}/htdocs/"
359
         pleroma_set_background_image_from_url "/var/www/${pleroma_domain}/htdocs" "$pleroma_domain" "$background_url" "$title"
359
         pleroma_set_background_image_from_url "/var/www/${pleroma_domain}/htdocs" "$pleroma_domain" "$background_url" "$title"
360
     else
360
     else
361
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "$PLEROMA_DIR/priv/static"
361
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "$PLEROMA_DIR/priv/static"
362
         pleroma_set_background_image_from_url "$PLEROMA_DIR/priv/static" "$pleroma_domain" "$background_url" "$title"
362
         pleroma_set_background_image_from_url "$PLEROMA_DIR/priv/static" "$pleroma_domain" "$background_url" "$title"
363
     fi
363
     fi
364
 
364
 
412
         if [ -f "$basedir/static/config.json" ]; then
412
         if [ -f "$basedir/static/config.json" ]; then
413
             cp "$basedir/static/config.json" "$basedir/static/config.json.old"
413
             cp "$basedir/static/config.json" "$basedir/static/config.json.old"
414
         fi
414
         fi
415
-        cp -r "$INSTALL_DIR/pleroma/dist/*" "$basedir/"
415
+        cp -r "$INSTALL_DIR/pleroma/dist/"* "$basedir/"
416
         if [ -f "$basedir/static/config.json.old" ]; then
416
         if [ -f "$basedir/static/config.json.old" ]; then
417
             mv "$basedir/static/config.json.old" "$basedir/static/config.json"
417
             mv "$basedir/static/config.json.old" "$basedir/static/config.json"
418
         fi
418
         fi

+ 1
- 1
src/freedombone-utils-gpg 查看文件

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

+ 5
- 5
src/freedombone-utils-keys 查看文件

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

+ 2
- 2
src/freedombone-utils-onion 查看文件

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

+ 2
- 2
src/freedombone-utils-web 查看文件

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