Fix for writing to DECS, beautifying output

erase_drive.sh

@@ -144,24 +144,18 @@ mount_remote () {
     mkdir -p /mnt/decs
     if mount -t cifs -o user="$netid",sec=krb5i "//decs/decs/support/dban_logs" /mnt/decs
     then
-        if [ ! -w "//decs/decs/support/dban_logs" ]; then
+        if ! mkdir -p /mnt/decs/"$ticket_number"; then
-            logwarning "Insufficient permissions to write in //decs/decs/support/dban_logs"
+            logerror "Insufficient permissions to write in //decs/decs/support/dban_logs"
             exit
-        fi
-        if [[ ! $ticket_number =~ ^\s*$ ]];
-        then
-            mkdir -p /mnt/decs/UNKNWN-"$start_time" 
-            logdir=/mnt/decs/UNKNWN-"$start_time" 
         else
-            mkdir -p /mnt/decs/"$ticket_number"
             logdir=/mnt/decs/"$ticket_number"
-        fi
             cp "$log" "$logdir"/log_"$ticket_number"_"$start_time".log
             cp "$log_x" "$logdir"/log_x_"$ticket_number"_"$start_time".log
             log="$logdir"/log_"$ticket_number"_"$start_time".log
             log_x="$logdir"/log_x_"$ticket_number"_"$start_time".log
             exec 1>>"$log_x" 2>&1
             set -x
+        fi
     else
         logerror "Failed to mount remote DECS drive. Stopping"
         exit
@@ -680,20 +674,27 @@ main (){
     if [[ ! $offline = "true" ]];
     then
         get_netid
+        loginfo ""
     fi
 
     get_ticket
+    loginfo ""
 
     if [[ ! $offline = "true" ]];
     then
         mount_remote
+        loginfo ""
     fi
     
     get_eraselevel #sets $eraselevel to 0-2 based on how to erase. Higher levels include lower levels.
+    loginfo ""
     get_devicetype #sets $devicetype to HDD_SATA/SSD_SATA/SSD_NVME
+    loginfo ""
     get_device #sets $device to one of the /dev/xyz devices.
+    loginfo ""
     
     make_infolog #Logs a bunch of details to a info log file from the system.
+    loginfo ""
 
     loginfo "Starting process for erasing $devicetype : $device with erase level $eraselevel."
 
@@ -705,6 +706,8 @@ main (){
         confirm_message "Please type 'confirm' to begin." "confirm"
     fi
 
+    loginfo ""
+
     case $eraselevel in
         "0")
             erase_device_lv0 #Wipe partition
@@ -727,7 +730,9 @@ main (){
         ;;
     esac    
 
+    loginfo ""
     loginfo "Finished erasing $devicetype : $device with erase level $eraselevel."
+    loginfo ""
 
     cleanup
 }

log_drive_info.sh

@@ -103,18 +103,18 @@ mount_remote () {
     mkdir -p /mnt/decs
     if mount -t cifs -o user="$netid",sec=krb5i "//decs/decs/support/dban_logs" /mnt/decs
     then
-        if [ ! -w "//decs/decs/support/dban_logs" ]; then
+        if ! mkdir -p /mnt/decs/UNKNWN; then
-            logwarning "Insufficient permissions to write in //decs/decs/support/dban_logs"
+            logerror "Insufficient permissions to write in //decs/decs/support/dban_logs"
             exit
-        fi
+        else
-        logdir=/mnt/decs/UNKNWN-"$start_time"
+            logdir=/mnt/decs/UNKNWN
-        mkdir -p "$logdir"
             cp "$log" "$logdir"/log_UNKNWN_"$start_time".log
             cp "$log_x" "$logdir"/log_x_UNKNWN_"$start_time".log
             log="$logdir"/log_UNKNWN_"$start_time".log
             log_x="$logdir"/log_x_UNKNWN_"$start_time".log
             exec 1>>"$log_x" 2>&1
             set -x
+        fi
     else
         logerror "Failed to mount remote DECS drive. Stopping"
         exit
@@ -424,12 +424,16 @@ main (){
     then
         get_netid
         mount_remote
+        loginfo ""
     fi
     
     get_devicetype #sets $devicetype to HDD_SATA/SSD_SATA/SSD_NVME
+    loginfo ""
     get_device #sets $device to one of the /dev/xyz devices.
+    loginfo ""
     
     make_infolog #Logs a bunch of details to a info log file from the system.
+    loginfo ""
 
     loginfo "Finished gathering logs of $devicetype : $device."