From eca9695b01c06bed4cd14ac761a97efb15b2d112 Mon Sep 17 00:00:00 2001 From: debugtalk Date: Thu, 20 Jan 2022 18:54:56 +0800 Subject: [PATCH] fix: unzip package on windows --- .github/workflows/release.yml | 2 ++ cli/scripts/install.sh | 17 ++++++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c607fbcf..c73f3cc6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -29,6 +29,8 @@ jobs: binary_name: "hrp" ldflags: "-s -w" extra_files: LICENSE README.md docs/CHANGELOG.md + - name: Test install.sh + run: bash cli/scripts/install.sh - name: Setup aliyun OSS uses: manyuanrong/setup-ossutil@v2.0 with: diff --git a/cli/scripts/install.sh b/cli/scripts/install.sh index 3259fe41..14573cd8 100644 --- a/cli/scripts/install.sh +++ b/cli/scripts/install.sh @@ -54,6 +54,17 @@ function get_download_url() { echo $url } +function extract_pkg() { + pkg=$1 + if [[ $pkg == *.zip ]]; then # windows + echo "$ unzip -o $pkg -d ." + unzip -o $pkg -d . + else + echo "$ tar -xzf $pkg" + tar -xzf "$pkg" + fi +} + function main() { echoInfo "Detect target hrp package..." version=$(get_latest_version) @@ -62,7 +73,8 @@ function main() { echo "Current OS: $os" arch=$(get_arch) echo "Current ARCH: $arch" - pkg="hrp-$version-$os-$arch$(get_pkg_suffix $os)" + pkg_suffix=$(get_pkg_suffix $os) + pkg="hrp-$version-$os-$arch$pkg_suffix" url=$(get_download_url $pkg) echo "Selected package: $url" echo @@ -80,8 +92,7 @@ function main() { echo echoInfo "Extracting..." - echo "$ tar -xzf $pkg" - tar -xzf "$pkg" + extract_pkg "$pkg" echo "$ ls -lh" ls -lh echo