diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh index cfb45cbe..b5c1d599 100755 --- a/files/initrd/opt/arc/arc.sh +++ b/files/initrd/opt/arc/arc.sh @@ -539,12 +539,12 @@ function make() { LD_LIBRARY_PATH="${EXTRACTOR_PATH}" "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_FILE}" "${UNTAR_PAT_PATH}" else # Untar PAT file - tar xf "${PAT_FILE}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 + tar -xf "${PAT_FILE}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 fi # Cleanup PAT Download rm -f "${PAT_FILE}" elif [ -f "${DSM_FILE}" ]; then - tar xf "${DSM_FILE}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 + tar -xf "${DSM_FILE}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 elif [ ! -f "${UNTAR_PAT_PATH}/zImage" ]; then dialog --backtitle "$(backtitle)" --title "DSM Download" --aspect 18 \ --msgbox "ERROR: No DSM Image found!" 0 0 @@ -631,7 +631,7 @@ function offlinemake() { LD_LIBRARY_PATH="${EXTRACTOR_PATH}" "${EXTRACTOR_PATH}/${EXTRACTOR_BIN}" "${PAT_FILE}" "${UNTAR_PAT_PATH}" else # Untar PAT file - tar xf "${PAT_FILE}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 + tar -xf "${PAT_FILE}" -C "${UNTAR_PAT_PATH}" >"${LOG_FILE}" 2>&1 fi # Cleanup old PAT rm -f "${PAT_FILE}" @@ -1696,7 +1696,7 @@ function updateMenu() { ADDON=$(basename ${PKG} | sed 's|.addon||') rm -rf "${ADDONS_PATH}/${ADDON:?}" mkdir -p "${ADDONS_PATH}/${ADDON}" - tar xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1 + tar -xaf "${PKG}" -C "${ADDONS_PATH}/${ADDON}" >/dev/null 2>&1 rm -f "${ADDONS_PATH}/${ADDON}.addon" done rm -f "${TMP_PATH}/addons.zip" @@ -2720,7 +2720,7 @@ function greplogs() { dialog --backtitle "$(backtitle)" --colors --title "Grep Logs" \ --infobox "Copy Log Files." 3 20 sleep 2 - tar cfz "${TMP_PATH}/log.tar.gz" "${PART1_PATH}/logs" >/dev/null 2>&1 + tar -cfz "${TMP_PATH}/log.tar.gz" "${PART1_PATH}/logs" >/dev/null 2>&1 dialog --backtitle "$(backtitle)" --colors --title "Grep Logs" \ --msgbox "Logs can be found at /tmp/log.tar.gz" 5 40 } diff --git a/files/initrd/opt/arc/include/addons.sh b/files/initrd/opt/arc/include/addons.sh index 7b58ad4c..7e1e1cd7 100755 --- a/files/initrd/opt/arc/include/addons.sh +++ b/files/initrd/opt/arc/include/addons.sh @@ -57,12 +57,12 @@ function installAddon() { local HAS_FILES=0 # First check generic files if [ -f "${ADDONS_PATH}/${ADDON}/all.tgz" ]; then - tar zxf "${ADDONS_PATH}/${ADDON}/all.tgz" -C "${TMP_PATH}/${ADDON}" + tar -zxf "${ADDONS_PATH}/${ADDON}/all.tgz" -C "${TMP_PATH}/${ADDON}" HAS_FILES=1 fi # Now check specific platform files if [ -f "${ADDONS_PATH}/${ADDON}/${2}-${3}.tgz" ]; then - tar zxf "${ADDONS_PATH}/${ADDON}/${2}-${3}.tgz" -C "${TMP_PATH}/${ADDON}" + tar -zxf "${ADDONS_PATH}/${ADDON}/${2}-${3}.tgz" -C "${TMP_PATH}/${ADDON}" HAS_FILES=1 fi # If has files to copy, copy it, else return error @@ -85,7 +85,7 @@ function untarAddon() { fi rm -rf "${TMP_PATH}/addon" mkdir -p "${TMP_PATH}/addon" - tar xaf "${1}" -C "${TMP_PATH}/addon" || return + tar -xaf "${1}" -C "${TMP_PATH}/addon" || return local ADDON=$(readConfigKey "name" "${TMP_PATH}/addon/manifest.yml") [ -z "${ADDON}" ] && return rm -rf "${ADDONS_PATH}/${ADDON:?}" @@ -101,7 +101,7 @@ function updateAddons() { rm -rf "${ADDONS_PATH}/${ADDON:?}" mkdir -p "${ADDONS_PATH}/${ADDON}" echo "Installing ${F} to ${ADDONS_PATH}/${ADDON}" - tar xaf "${F}" -C "${ADDONS_PATH}/${ADDON}" + tar -xaf "${F}" -C "${ADDONS_PATH}/${ADDON}" rm -f "${F}" done } diff --git a/files/initrd/opt/arc/include/modules.sh b/files/initrd/opt/arc/include/modules.sh index 6e1d4295..6aff77a4 100755 --- a/files/initrd/opt/arc/include/modules.sh +++ b/files/initrd/opt/arc/include/modules.sh @@ -91,9 +91,9 @@ function addToModules() { # Unzip modules for temporary folder rm -rf "${TMP_PATH}/modules" mkdir -p "${TMP_PATH}/modules" - tar zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" + tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" cp -f ${KOFILE} ${TMP_PATH}/modules - tar zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" . + tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" . } ############################################################################### @@ -113,9 +113,9 @@ function delToModules() { # Unzip modules for temporary folder rm -rf "${TMP_PATH}/modules" mkdir -p "${TMP_PATH}/modules" - tar zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" + tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" rm -f ${TMP_PATH}/modules/${KONAME} - tar zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" . + tar -zcf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" . } ############################################################################### @@ -146,7 +146,7 @@ function getdepends() { # Unzip modules for temporary folder rm -rf "${TMP_PATH}/modules" mkdir -p "${TMP_PATH}/modules" - tar zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" + tar -zxf "${MODULES_PATH}/${PLATFORM}-${KVER}.tgz" -C "${TMP_PATH}/modules" DPS=($(_getdepends ${KONAME} | tr ' ' '\n' | sort -u)) echo ${DPS[@]} rm -rf "${TMP_PATH}/modules"