From 2fc42c8e9f31dedc722aab8cca14a2622eccc44b Mon Sep 17 00:00:00 2001
From: Roey Darwish Dror <roey.ghost@gmail.com>
Date: Wed, 14 Aug 2019 20:11:45 +0300
Subject: [PATCH] Revert "Shellcheck ci scripts, add a small .editorconfig
 (#186)"

This reverts commit 7cfdc69b634a9ed6d1f51676381ee52e1c90de17.

It breaks self update
---
 .editorconfig       |  3 ---
 ci/before_deploy.sh | 17 +++++++--------
 ci/install.sh       | 50 ++++++++++++++++++++++++++-------------------
 ci/script.sh        |  6 +++---
 4 files changed, 41 insertions(+), 35 deletions(-)
 delete mode 100644 .editorconfig

diff --git a/.editorconfig b/.editorconfig
deleted file mode 100644
index 73225bf9..00000000
--- a/.editorconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-[ci/*.sh]
-indent_style = space
-indent_size = 4
diff --git a/ci/before_deploy.sh b/ci/before_deploy.sh
index 3ec233aa..099344a5 100644
--- a/ci/before_deploy.sh
+++ b/ci/before_deploy.sh
@@ -3,9 +3,10 @@
 set -ex
 
 main() {
-    src=$(pwd)
+    local src=$(pwd) \
+          stage=
 
-    case "$TRAVIS_OS_NAME" in
+    case $TRAVIS_OS_NAME in
         linux)
             stage=$(mktemp -d)
             ;;
@@ -17,16 +18,16 @@ main() {
     test -f Cargo.lock || cargo generate-lockfile
 
     # TODO Update this to build the artifacts that matter to you
-    cross rustc --bin topgrade --target "$TARGET" --release --all-features -- -C lto
+    cross rustc --bin topgrade --target $TARGET --release --all-features -- -C lto
 
     # TODO Update this to package the right artifacts
-    cp target/"$TARGET"/release/topgrade "$stage"/
+    cp target/$TARGET/release/topgrade $stage/
 
-    cd "$stage"
-    tar czf "$src"/"$CRATE_NAME"-"$TRAVIS_TAG"-"$TARGET".tar.gz ./*
-    cd "$src"
+    cd $stage
+    tar czf $src/$CRATE_NAME-$TRAVIS_TAG-$TARGET.tar.gz *
+    cd $src
 
-    rm -rf "$stage"
+    rm -rf $stage
 }
 
 main
diff --git a/ci/install.sh b/ci/install.sh
index e923a6f2..80e18e47 100644
--- a/ci/install.sh
+++ b/ci/install.sh
@@ -1,39 +1,47 @@
 set -ex
 
 main() {
-    if [ "$TRAVIS_OS_NAME" = linux ]; then
+    local target=
+    if [ $TRAVIS_OS_NAME = linux ]; then
         target=x86_64-unknown-linux-musl
-        sort="sort"
+        sort=sort
     else
         target=x86_64-apple-darwin
-        sort="gsort" # for `sort --sort-version`, from brew's coreutils.
+        sort=gsort  # for `sort --sort-version`, from brew's coreutils.
     fi
 
     # Builds for iOS are done on OSX, but require the specific target to be
     # installed.
-    # shellcheck disable=SC2153
-    case "$TARGET" in
-        aarch64-apple-ios | \
-            armv7-apple-ios | \
-            armv7s-apple-ios | \
-            i386-apple-ios | \
-            x86_64-apple-ios)
-            rustup target install "$TARGET"
+    case $TARGET in
+        aarch64-apple-ios)
+            rustup target install aarch64-apple-ios
+            ;;
+        armv7-apple-ios)
+            rustup target install armv7-apple-ios
+            ;;
+        armv7s-apple-ios)
+            rustup target install armv7s-apple-ios
+            ;;
+        i386-apple-ios)
+            rustup target install i386-apple-ios
+            ;;
+        x86_64-apple-ios)
+            rustup target install x86_64-apple-ios
             ;;
     esac
 
     # This fetches latest stable release
-    tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross |
-              cut -d/ -f3 |
-              grep -E '^v[0.1.0-9.]+$' |
-              $sort --version-sort |
-              tail -n1)
-    curl -LSfs https://japaric.github.io/trust/install.sh |
+    local tag=$(git ls-remote --tags --refs --exit-code https://github.com/japaric/cross \
+                       | cut -d/ -f3 \
+                       | grep -E '^v[0.1.0-9.]+$' \
+                       | $sort --version-sort \
+                       | tail -n1)
+    curl -LSfs https://japaric.github.io/trust/install.sh | \
         sh -s -- \
-            --force \
-            --git japaric/cross \
-            --tag "$tag" \
-            --target $target
+           --force \
+           --git japaric/cross \
+           --tag $tag \
+           --target $target
 }
 
 main
diff --git a/ci/script.sh b/ci/script.sh
index d7830112..4bdfe0f7 100644
--- a/ci/script.sh
+++ b/ci/script.sh
@@ -7,9 +7,9 @@ main() {
     cargo fmt --all -- --check
     cross clippy --all-targets -- -D warnings
     cross clippy --all-targets --all-features -- -D warnings
-    cross check --target "$TARGET" --release --all-features
+    cross check --target $TARGET --release --all-features
 
-    if [ -n "$DISABLE_TESTS" ]; then
+    if [ ! -z $DISABLE_TESTS ]; then
         return
     fi
 
@@ -17,6 +17,6 @@ main() {
 }
 
 # we don't run the "test phase" when doing deploys
-if [ -z "$TRAVIS_TAG" ]; then
+if [ -z $TRAVIS_TAG ]; then
     main
 fi