core: add check for mkdir and normalize logging file

Signed-off-by: Ansuel Smith <[email protected]>
Ansuel · Dec 15, 2020 · db965bf · db965bf
1 parent 3dc5d0c
commit db965bf
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 21 deletions.
diff --git a/decompressed/base/etc/init.d/do_migrate_overlay b/decompressed/base/etc/init.d/do_migrate_overlay
@@ -7,17 +7,17 @@ EXTRA_HELP="        preserve_files  Transfer files from modoverlay to bank"
 upperdir=/modoverlay/bank_mod
 overlay_bank=/overlay/bank_2
 
-migrate_log_file=/overlay/modgui_log/migrate_log_$(date +"%H-%M_%m-%d-%y")
+logging_file=/overlay/modgui_log/migrate_log_$(date +"%H-%M_%m-%d-%y")
 
 create_modgui_log() {
-  mkdir /overlay/modgui_log
-  touch $migrate_log_file
+  [ ! -d /overlay/modgui_log ] && mkdir /overlay/modgui_log
+  touch $logging_file
 }
 
 kecho() {
-	echo mount_root-mod: $@
-	echo mount_root-mod: $@ > /dev/kmsg
-  echo mount_root-mod: $@ >> $migrate_log_file
+  echo mount_root-mod: "$@"
+  echo mount_root-mod: "$@" > /dev/kmsg
+  echo mount_root-mod: "$@" >> $logging_file
 }
 
 preserve_files() {

diff --git a/decompressed/base/etc/init.d/rootdevice b/decompressed/base/etc/init.d/rootdevice
@@ -58,37 +58,37 @@ EOF
 }
 
 ####################LOG FUNCTION#################
-rootdevice_log_file=/tmp/rootdevice_log
+logging_file=/tmp/rootdevice_log
 
 kecho() {
   echo "  " "$@" >/dev/console
-  echo "  " "$@" >>$rootdevice_log_file
+  echo "  " "$@" >>$logging_file
 }
 
 logecho() {
   if [ "$debug" -eq 1 ]; then
     logger -t "Root Script" "$@"
     echo "Root Script" "$@"
   fi
-  echo "Root Script" "$@" >>$rootdevice_log_file
+  echo "Root Script" "$@" >>$logging_file
 }
 
 logecho_always() {
   logger -t "Root Script" "$@"
-  echo "Root Script" "$@" >>$rootdevice_log_file
+  echo "Root Script" "$@" >>$logging_file
 }
 
 create_modgui_log() {
-  touch $rootdevice_log_file
+  touch $logging_file
 }
 
 save_modgui_log() {
-  mkdir /overlay/modgui_log
-  cp -rf $rootdevice_log_file "/overlay/modgui_log/rootdevice_log_$(date +%H-%M_%m-%d-%y)"
+  [ ! -d /overlay/modgui_log ] && mkdir /overlay/modgui_log
+  cp -rf $logging_file "/overlay/modgui_log/rootdevice_log_$(date +%H-%M_%m-%d-%y)"
 }
 
 sched_remove_modgui_log() {
-  mkdir /overlay/modgui_log.remove_due_to_upgrade
+  [ ! -d /overlay/modgui_log.remove_due_to_upgrade ] && mkdir /overlay/modgui_log.remove_due_to_upgrade
   mv /overlay/modgui_log/* /overlay/modgui_log.remove_due_to_upgrade/
   rm -rf /overlay/modgui_log
 }

diff --git a/decompressed/base/lib/upgrade/platform.sh b/decompressed/base/lib/upgrade/platform.sh
@@ -19,7 +19,7 @@ echo_log() {
 }
 
 save_log_and_exit() {
-        mkdir /overlay/modgui_log
+        [ ! -d /overlay/modgui_log ] && mkdir /overlay/modgui_log
         cp $logging_file /overlay/modgui_log/firmware_upgrade_log_$(date +"%H-%M_%m-%d-%y")
         reboot
         exit 1

diff --git a/decompressed/base/sbin/mount_root-mod b/decompressed/base/sbin/mount_root-mod
@@ -1,17 +1,17 @@
 #!/bin/sh
 
 ubi_num=
-mountroot_log_file=/overlay/modgui_log/mountroot_log_$(date +"%H-%M_%m-%d-%y")
+logging_file=/overlay/modgui_log/mountroot_log_$(date +"%H-%M_%m-%d-%y")
 
 create_modgui_log() {
-  mkdir /overlay/modgui_log
-  touch $rootdevice_log_file
+  [ ! -d /overlay/modgui_log ] && mkdir /overlay/modgui_log
+  touch $logging_file
 }
 
 kecho() {
-	echo mount_root-mod: $@
-	echo mount_root-mod: $@ > /dev/kmsg
-	echo mount_root-mod: $@ >> $rootdevice_log_file
+	echo mount_root-mod: "$@"
+	echo mount_root-mod: "$@" > /dev/kmsg
+	echo mount_root-mod: "$@" >> $logging_file
 }
 
 find_mtd_part() {