tvheadend: remove ${INST_LOG} and fix shellcheck SC2006 (legacy backt…

…icks)
SynoCommunity · Apr 12, 2021 · 01fb395 · 01fb395
1 parent 9a91f28
commit 01fb395
Showing 1 changed file with 29 additions and 29 deletions.
diff --git a/spk/tvheadend/src/service-setup.sh b/spk/tvheadend/src/service-setup.sh
@@ -6,7 +6,7 @@ HTTPP=9981
 HTSPP=9982
 
 # Replace generic service startup, run service in background
-GRPN=`id -gn ${EFF_USER}`
+GRPN=$(id -gn ${EFF_USER})
 HOME_DIR="${SYNOPKG_PKGDEST}/var"
 DVR_LOG_DIR="${SYNOPKG_PKGDEST}/var/dvr/log"
 SAVE_DIR="/tmp/tvheadend-recording-backup"
@@ -19,19 +19,19 @@ GROUP=sc-media
 service_postinst ()
 {
     # Encrypt password
-    wizard_password=`echo -n "TVHeadend-Hide-${wizard_password:=admin}" | openssl enc -a`
+    wizard_password=$(echo -n "TVHeadend-Hide-${wizard_password:=admin}" | openssl enc -a)
 
     # Edit the password configuration according to the wizard
     sed -i -e "s/@password@/${wizard_password}/g" ${SYNOPKG_PKGDEST}/var/passwd/a927e30a755504f9784f23a4efac5109
 
     # Fix fontconfig links
     CONFD_DIR="${SYNOPKG_PKGDEST}/etc/fonts/conf.d"
     FONTS_DIR="${SYNOPKG_PKGDEST}/share/fontconfig/conf.avail"
-    echo "Fixing fontconfig links" >> ${INST_LOG}
+    echo "Fixing fontconfig links"
     for FONT_FILE in ${CONFD_DIR}/*.conf
     do
-        FONT_NAME=`basename "${FONT_FILE}"`
-        $LN "${FONTS_DIR}/${FONT_NAME}" "${CONFD_DIR}/${FONT_NAME}" >> ${INST_LOG}
+        FONT_NAME=$(basename "${FONT_FILE}")
+        $LN "${FONTS_DIR}/${FONT_NAME}" "${CONFD_DIR}/${FONT_NAME}"
     done
 }
 
@@ -40,21 +40,21 @@ service_preupgrade ()
     # For backwards compatibility on DSM6
     if [ $SYNOPKG_DSM_VERSION_MAJOR -gt 5 ]; then
         # Backup potential recordings from package root directory
-        echo "Save potential recordings from package root directory..." >> ${INST_LOG}
+        echo "Save potential recordings from package root directory..."
         for logfile in ${DVR_LOG_DIR}/*
         do
-            REC_FILE=`grep -e 'filename' ${logfile} | awk -F'"' '{print $4}'`
+            REC_FILE=$(grep -e 'filename' ${logfile} | awk -F'"' '{print $4}')
             # Check whether recording actually exists, otherwise ignore the entry
             if [ -e "${REC_FILE}" ]; then
-                REC_DIR=`dirname "${REC_FILE}"`
-                REAL_DIR=`realpath "${REC_DIR}"`
-                TRUNC_DIR=`echo "${REAL_DIR}" | cut -c9-28`
-                CHECK_VAR=`echo "${REAL_DIR}" | cut -c29-32`
+                REC_DIR=$(dirname "${REC_FILE}")
+                REAL_DIR=$(realpath "${REC_DIR}")
+                TRUNC_DIR=$(echo "${REAL_DIR}" | cut -c9-28)
+                CHECK_VAR=$(echo "${REAL_DIR}" | cut -c29-32)
                 if [ ! "${REC_FILE}" = "" ] && [ "${TRUNC_DIR}" = "/@appstore/tvheadend" ] && [ ! "${CHECK_VAR}" = "/var" ]; then
-                    REC_NAME=`basename "${REC_FILE}"`
-                    REST_DIR=`echo "${REAL_DIR}" | cut -c30-`
+                    REC_NAME=$(basename "${REC_FILE}")
+                    REST_DIR=$(echo "${REAL_DIR}" | cut -c30-)
                     DEST_FILE="${SAVE_DIR}/${REST_DIR}/${REC_NAME}"
-                    echo "Saving: ${REC_FILE}" >> ${INST_LOG}
+                    echo "Saving: ${REC_FILE}"
                     $MKDIR "${SAVE_DIR}/${REST_DIR}"
                     $CP "${REC_FILE}" "${DEST_FILE}"
                     # Replace any remaining target links in log files first
@@ -66,13 +66,13 @@ service_preupgrade ()
         done
         # Move recording directories from package root into var
         UPGRADE_CFG_DIR="${SYNOPKG_PKGDEST}/var/dvr/config"
-        echo "Move any recording directories from package root directory into var..." >> ${INST_LOG}
+        echo "Move any recording directories from package root directory into var..."
         for file in ${UPGRADE_CFG_DIR}/*
         do
-            DVR_DIR=`grep -e 'storage\":' ${file} | awk -F'"' '{print $4}'`
-            REAL_DIR=`realpath "${DVR_DIR}"`
-            TRUNC_DIR=`echo "${REAL_DIR}" | cut -c9-28`
-            CHECK_VAR=`echo "${REAL_DIR}" | cut -c29-32`
+            DVR_DIR=$(grep -e 'storage\":' ${file} | awk -F'"' '{print $4}')
+            REAL_DIR=$(realpath "${DVR_DIR}")
+            TRUNC_DIR=$(echo "${REAL_DIR}" | cut -c9-28)
+            CHECK_VAR=$(echo "${REAL_DIR}" | cut -c29-32)
             # Replace any remaining target links in log files first
             sed -i -e "s,/var/packages/tvheadend/target,/usr/local/tvheadend,g" "${file}"
             if [ "${TRUNC_DIR}" = "/@appstore/tvheadend" ] && [ ! "${CHECK_VAR}" = "/var" ]; then
@@ -87,34 +87,34 @@ service_postupgrade ()
 {
     # For backwards compatibility, restore recordings from old package root into var directory
     if [ -d "${SAVE_DIR}" ]; then
-        echo "Restoring recordings into ${HOME_DIR}" >> ${INST_LOG}
-        $CP "${SAVE_DIR}"/. "${HOME_DIR}" >> ${INST_LOG}
+        echo "Restoring recordings into ${HOME_DIR}"
+        $CP "${SAVE_DIR}"/. "${HOME_DIR}"
         $RM "${SAVE_DIR}"
     fi
 
     # Need to enforce correct permissions for recording directories on upgrades
-    echo "Adding ${GROUP} group permissions on recording directories:"  >> ${INST_LOG}
+    echo "Adding ${GROUP} group permissions on recording directories:"
     UPGRADE_CFG_DIR="${SYNOPKG_PKGDEST}/var/dvr/config"
     for file in ${UPGRADE_CFG_DIR}/*
     do
-        DVR_DIR=`grep -e 'storage\":' ${file} | awk -F'"' '{print $4}'`
+        DVR_DIR=$(grep -e 'storage\":' ${file} | awk -F'"' '{print $4}')
         # Exclude directories in @appstore as ACL permissions srew up package installations
         TRUNC_DIR=$(echo "$(realpath ${DVR_DIR})" | awk -F/ '{print "/"$3}')
         if [ "${TRUNC_DIR}" = "/@appstore" ]; then
-            echo "Skip: ${DVR_DIR} (system directory)" >> ${INST_LOG}
+            echo "Skip: ${DVR_DIR} (system directory)"
         elif [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then
-            echo "Done: ${DVR_DIR}" >> ${INST_LOG}
+            echo "Done: ${DVR_DIR}"
             set_syno_permissions "${DVR_DIR}" "${GROUP}"
         fi
     done
 
     # For backwards compatibility, restore ownership of package system directories
-    echo "Restore '${EFF_USER}' unix permissions on package system directories" >> ${INST_LOG}
+    echo "Restore '${EFF_USER}' unix permissions on package system directories"
     if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 6 ]; then
-        synoacltool -del "${SYNOPKG_PKGDEST}" >> ${INST_LOG} 2>&1
-        chown ${EFF_USER}:root "/var/packages/tvheadend" >> ${INST_LOG} 2>&1
+        synoacltool -del "${SYNOPKG_PKGDEST}"
+        chown ${EFF_USER}:root "/var/packages/tvheadend"
     elif [ $SYNOPKG_DSM_VERSION_MAJOR == 6 ]; then
-        chown ${EFF_USER}:${USER} "/var/packages/tvheadend/target" >> ${INST_LOG} 2>&1
+        chown ${EFF_USER}:${USER} "/var/packages/tvheadend/target"
         set_unix_permissions "${SYNOPKG_PKGDEST}/var"
     fi
 }