Add linux + arch to zip suffix (#10)

* Add linux + arch to zip suffix * Bump version
guangie88 · Apr 17, 2018 · 28cd557 · 28cd557
1 parent cd9185d
commit 28cd557
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -71,13 +71,14 @@ after_success:
   elif [ "$ARTIFACT" = "true" ] && [ -n "$TRAVIS_TAG" ]; then
     # upload binary artifact when this is a new tag
     # this needs to be jq processed to extract out the `id` value
-    export TAG_ID=$(curl -X GET \
+    TAG_ID=$(curl -X GET \
       -H "Authorization: token $GITHUB_TOKEN" \
       "https://api.github.com/repos/$REPO_USERNAME/$REPO_NAME/releases" \
       | jq -r '.[] | select(.tag_name == "'$TRAVIS_TAG'").id')
 
     # formulate zip
-    export ZIP_FILE=$BINARY_NAME-$TRAVIS_TAG.zip
+    ZIP_SUFFIX=`uname -s | tr '[:upper:]' '[:lower:]'`-`uname -i`
+    ZIP_FILE=$BINARY_NAME-$TRAVIS_TAG-$ZIP_SUFFIX.zip
     zip -j $ZIP_FILE "$ARTIFACTS_DIR/$BINARY_NAME"
 
     curl -X POST \

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "terraform-zap"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Chen Weiguang <chen.weiguang@gmail.com>"]
 description = "Script wrapper to perform finer terraform destroy"
 repository = "https://github.com/guangie88/terraform-zap"
@@ -19,7 +19,7 @@ is_executable = "=0.1.0"
 structopt = "=0.2.7"
 structopt-derive = "=0.2.7"
 subprocess = "=0.1.12"
-terraform-zap-ignore-lib = { path = "ignore-lib", version = "0.2.2" }
+terraform-zap-ignore-lib = { path = "ignore-lib", version = "0.2.3" }
 toml = "=0.4.6"
 which = "=2.0.0"
 whiteread = "=0.4.3"

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ commands in order to skip the above resources to possibly resolve the
 
 ## How to install
 
-### Direct download for Linux (AMD64)
+### Direct download for Linux x86_64
 
 The easiest way is to run the install script using shell as shown below.
 

diff --git a/ignore-lib/Cargo.toml b/ignore-lib/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "terraform-zap-ignore-lib"
-version = "0.2.2"
+version = "0.2.3"
 authors = ["Chen Weiguang <chen.weiguang@gmail.com>"]
 description = "Provides ignore implementation to terraform-zap"
 documentation = "https://docs.rs/terraform-zap-ignore-lib"

diff --git a/install-linux.sh b/install-linux.sh
@@ -12,7 +12,9 @@ LATEST_TAG=$(curl -sSf "https://api.github.com/repos/$REPO_USERNAME/$REPO_NAME/r
     | sed -n 's/.*"\(v.*\)".*/\1/p')
 
 BINARY_FILE=terraform-zap
-ZIP_FILE=$BINARY_FILE-$LATEST_TAG.zip
+ZIP_SUFFIX=`uname -s | tr '[:upper:]' '[:lower:]'`-`uname -i`
+ZIP_FILE=$BINARY_NAME-$TRAVIS_TAG-$ZIP_SUFFIX.zip
+
 BIN_DIR=/usr/local/bin
 
 # unzip cannot work on Unix pipe