From 1ada2916d73215f02eaea504e0403e9b226ef2ed Mon Sep 17 00:00:00 2001
From: MegaV0lt <MegaV0lt@users.noreply.github.com>
Date: Fri, 27 Sep 2019 08:56:11 +0200
Subject: [PATCH] Update log2ram

Double quote to prevent globbing for variables.
Replace '! -z' by '-n' for better readability.
Function isSafe: Only check once for existing dir.
---
 log2ram | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/log2ram b/log2ram
index 6c40fc9..4329394 100755
--- a/log2ram
+++ b/log2ram
@@ -5,14 +5,13 @@
 HDD_LOG=/var/hdd.log
 RAM_LOG=/var/log
 
-LOG_NAME="log2ram.log"
+LOG_NAME='log2ram.log'
 LOG2RAM_LOG="${RAM_LOG}/${LOG_NAME}"
 LOG_OUTPUT="tee -a $LOG2RAM_LOG"
-printf -v NOW '%(%F %H:%M:%S)T' -1 || NOW=$(date '+%F %H:%M:%S')  # Actual date and time (date as fallback)
+printf -v NOW '%(%F %H:%M:%S)T' -1 || NOW="$(date '+%F %H:%M:%S')"  # Actual date and time (date as fallback)
 
 isSafe () {
-    [ -d $HDD_LOG/ ] || echo "ERROR: $HDD_LOG/ doesn't exist! Can't sync."
-    [ -d $HDD_LOG/ ] || exit 1
+    [ ! -d "$HDD_LOG/" ] && { echo "ERROR: $HDD_LOG/ doesn't exist! Can't sync." ; exit 1 ;}
 }
 
 syncToDisk () {
@@ -29,12 +28,12 @@ syncToDisk () {
 syncFromDisk () {
     isSafe
 
-    if [ ! -z "$(du -sh -t "$SIZE" $HDD_LOG/ | cut -f1)" ]; then
-        echo "ERROR: RAM disk too small. Can't sync."
+    if [ -n "$(du -sh -t "$SIZE" $HDD_LOG/ | cut -f1)" ]; then
+        echo 'ERROR: RAM disk too small. Can\'t sync.'
         umount -l $RAM_LOG/
         umount -l $HDD_LOG/
         if [ "$MAIL" = true ]; then
-            echo "LOG2RAM : No place on RAM anymore, fallback on the disk" | mail -s 'Log2Ram Error' root;
+            echo 'LOG2RAM : No place on RAM anymore, fallback on the disk' | mail -s 'Log2Ram Error' root;
         fi
         exit 1
     fi
@@ -55,29 +54,29 @@ wait_for () {
 
 createZramLogDrive () {
 	# Check Zram Class created
-	if [ ! -d "/sys/class/zram-control" ]; then
+	if [ ! -d '/sys/class/zram-control' ]; then
 		modprobe zram
 		RAM_DEV='0'
 	else
 		RAM_DEV=$(cat /sys/class/zram-control/hot_add)
 	fi
-	echo ${COMP_ALG} > /sys/block/zram${RAM_DEV}/comp_algorithm
-	echo ${LOG_DISK_SIZE} > /sys/block/zram${RAM_DEV}/disksize
-	echo ${SIZE} > /sys/block/zram${RAM_DEV}/mem_limit
-	mke2fs -t ext4 /dev/zram${RAM_DEV}
+	echo "${COMP_ALG}" > "/sys/block/zram${RAM_DEV}/comp_algorithm"
+	echo "${LOG_DISK_SIZE}" > "/sys/block/zram${RAM_DEV}/disksize"
+	echo "${SIZE}" > "/sys/block/zram${RAM_DEV}/mem_limit"
+	mke2fs -t ext4 "/dev/zram${RAM_DEV}"
 }
 
 case "$1" in
   start)
-      [ -d $HDD_LOG/ ] || mkdir $HDD_LOG/
+      [ ! -d "$HDD_LOG/" ] && mkdir $HDD_LOG/
       mount --bind $RAM_LOG/ $HDD_LOG/
       mount --make-private $HDD_LOG/
       wait_for $HDD_LOG
 	if [ "$ZL2R" = true ]; then
 		createZramLogDrive
-		mount -t ext4 -o nosuid,noexec,nodev,user=log2ram /dev/zram${RAM_DEV} ${RAM_LOG}/
+		mount -t ext4 -o nosuid,noexec,nodev,user=log2ram "/dev/zram${RAM_DEV}" ${RAM_LOG}/
 	else
-		mount -t tmpfs -o nosuid,noexec,nodev,mode=0755,size=${SIZE} log2ram $RAM_LOG/
+		mount -t tmpfs -o "nosuid,noexec,nodev,mode=0755,size=${SIZE}" log2ram $RAM_LOG/
 	fi
       wait_for $RAM_LOG
       syncFromDisk