diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 59cd2283..90fd84f8 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -175,7 +175,7 @@ jobs: while read F; do if [ -d "${F}" ]; then FTGZ="`basename "${F}"`.tgz" - tar czf "${FTGZ}" -C "${F}" . + tar -czf "${FTGZ}" -C "${F}" . sha256sum "${FTGZ}" >> sha256sum zip -9j update.zip "${FTGZ}" rm "${FTGZ}" diff --git a/scripts/func.sh b/scripts/func.sh index 866cca67..1dbd2a03 100644 --- a/scripts/func.sh +++ b/scripts/func.sh @@ -74,7 +74,7 @@ function getLKMs() { rm -f "${CACHE_FILE}" TAG=`curl -s "https://api.github.com/repos/wjz304/redpill-lkm/releases/latest" | grep -oP '"tag_name": "\K(.*)(?=")'` STATUS=`curl -w "%{http_code}" -L "https://github.com/wjz304/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o "${CACHE_FILE}"` - echo "Status=${STATUS}" + echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 # Unzip LKMs rm -rf "${DEST_PATH}"; mkdir -p "${DEST_PATH}" @@ -93,7 +93,7 @@ function getAddons() { local CACHE_FILE="/tmp/addons.zip" TAG=`curl -s https://api.github.com/repos/wjz304/arpl-addons/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` STATUS=`curl -w "%{http_code}" -L "https://github.com/wjz304/arpl-addons/releases/download/${TAG}/addons.zip" -o "${CACHE_FILE}"` - echo "Status=${STATUS}" + echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 rm -rf "${DEST_PATH}"; mkdir -p "${DEST_PATH}" # Install Addons @@ -105,7 +105,7 @@ function getAddons() { ADDON=`basename "${PKG}" .addon` mkdir -p "${DEST_PATH}/${ADDON}" echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}" - tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" + tar -xaf "${PKG}" -C "${DEST_PATH}/${ADDON}" done echo "Getting Addons end" } @@ -120,7 +120,7 @@ function getModules() { rm -f "${CACHE_FILE}" TAG=`curl -s https://api.github.com/repos/wjz304/arpl-modules/releases/latest | grep -oP '"tag_name": "\K(.*)(?=")'` STATUS=`curl -w "%{http_code}" -L "https://github.com/wjz304/arpl-modules/releases/download/${TAG}/modules.zip" -o "${CACHE_FILE}"` - echo "Status=${STATUS}" + echo "TAG=${TAG}; Status=${STATUS}" [ ${STATUS} -ne 200 ] && exit 1 # Unzip Modules rm -rf "${DEST_PATH}"; mkdir -p "${DEST_PATH}" diff --git a/scripts/grub.sh b/scripts/grub.sh index a2012286..721777e2 100644 --- a/scripts/grub.sh +++ b/scripts/grub.sh @@ -11,7 +11,7 @@ GRUB=${1:-"grub-2.06"} BIOS=${2:-"i386-pc i386-efi x86_64-efi"} curl -#kLO https://ftp.gnu.org/gnu/grub/${GRUB}.tar.gz -tar zxvf ${GRUB}.tar.gz +tar -zxvf ${GRUB}.tar.gz pushd ${GRUB} for B in ${BIOS}