Parcourir la source

fix crontab symlinking to use glob instead of ls for iteration

Nick Sweeting il y a 1 an
Parent
commit
8e9cfc8869
1 fichiers modifiés avec 4 ajouts et 4 suppressions
  1. 4 4
      bin/docker_entrypoint.sh

+ 4 - 4
bin/docker_entrypoint.sh

@@ -166,13 +166,13 @@ fi
 # symlink etc crontabs into place
 mkdir -p "$DATA_DIR/crontabs"
 if ! test -L /var/spool/cron/crontabs; then
-    # copy files from old location into new data dir location
-    for file in $(ls /var/spool/cron/crontabs); do
-        cp /var/spool/cron/crontabs/"$file" "$DATA_DIR/crontabs"
+    # move files from old location into new data dir location
+    for existing_file in /var/spool/cron/crontabs/*; do
+        mv "$existing_file" "$DATA_DIR/crontabs/"
     done
     # replace old system path with symlink to data dir location
     rm -Rf /var/spool/cron/crontabs
-    ln -s "$DATA_DIR/crontabs" /var/spool/cron/crontabs
+    ln -sf "$DATA_DIR/crontabs" /var/spool/cron/crontabs
 fi
 
 # set DBUS_SYSTEM_BUS_ADDRESS & DBUS_SESSION_BUS_ADDRESS