Lint with shellcheck

Author: cybertk

cibuild

@@ -2,18 +2,24 @@
 
 set -e
 
-export SCRIPT_DIR=`dirname $0`
+SCRIPT_DIR=$(dirname "$0")
+export SCRIPT_DIR
 
 # Includes
-. $SCRIPT_DIR/update_build_number
-. $SCRIPT_DIR/update_version
-. $SCRIPT_DIR/update_keychain
+. "$SCRIPT_DIR/update_build_number"
+. "$SCRIPT_DIR/update_version"
+. "$SCRIPT_DIR/update_keychain"
 
-GIT_COMMIT=`git rev-parse --short HEAD`
-GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`
-GIT_TAG=`git describe --tags --exact-match --match "v*" 2>/dev/null || echo ""`
-GIT_DIRTY=`test -n "$(git status --porcelain)" && echo true || echo false`
-GIT_LOG=`git log -1 --pretty=format:%s`
+GIT_COMMIT=$(git rev-parse --short HEAD)
+GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+GIT_TAG=$(git describe --GIT_TAGs --exact-match --match "v*" 2>/dev/null || echo "")
+GIT_DIRTY=$(test -n "$(git status --porcelain)" && echo true || echo false)
+GIT_LOG=$(git log -1 --pretty=format:%s)
+export GIT_COMMIT GIT_BRANCH GIT_TAG GIT_DIRTY GIT_LOG
+
+BUILD=
+VERSION=
+export BUILD VERSION
 
 silent=0
 
@@ -33,32 +39,31 @@ say ()
 if [ "$CI_SERVER_NAME" = "GitLab CI" ];
 then
     say "GitLab CI detected."
-    branch=$CI_BUILD_REF_NAME
-    build=$CI_BUILD_ID
-    commit=$CI_BUILD_REF
-    tag=${GIT_TAG:1}
+    GIT_BRANCH=$CI_BUILD_REF_NAME
+    GIT_COMMIT=$CI_BUILD_REF
+    VERSION=${GIT_TAG:1}
+    BUILD=$CI_BUILD_ID
 fi
 
 import_certs
 import_provisions
 
-if [ -n "$tag" ];
+if [ -n "$GIT_TAG" ];
 then
-    say "Preparing for Beta Release $tag"
+    say "Preparing for Beta Release $GIT_TAG"
 
-    update_build_number $build
-    update_version $tag
+    update_build_number "$BUILD"
+    update_version "$VERSION"
 
     make release-beta
 
-elif [ "$branch" = "master" ];
+elif [ "$GIT_BRANCH" = "master" ];
 then
     say "Preparing for Alpha Release"
 
-    update_build_number $build
+    update_build_number "$BUILD"
 
     make release-alpha
-    ipa build -c Alpha
 
 else
     say "Preparing for Development Release"

update_build_number

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-update_build_number ()
-{
+update_build_number() {
     local build=$1
 
     if ! echo "$build" | grep -q -E '^[0-9]+$'
@@ -10,7 +9,7 @@ update_build_number ()
         exit 1
     fi
 
-    xcrun agvtool new-version -all $build
+    xcrun agvtool new-version -all "$build"
 }
 
 export -f update_build_number

update_keychain

@@ -1,3 +1,5 @@
+#!/usr/bin/env bash
+
 # The name of the keychain to create for iOS code signing.
 KEYCHAIN=ck-ios-build.keychain
 
@@ -12,7 +14,7 @@ import_certs ()
 
     if security show-keychain-info "$KEYCHAIN"  >/dev/null 2>&1
     then
-        echo "warnning: $KEYCHIAN already exist, force removed"
+        echo "warnning: $KEYCHAIN already exist, force removed"
         security delete-keychain "$KEYCHAIN"
     fi
 
@@ -50,7 +52,7 @@ import_provisions ()
     fi
 
     local p
-    for p in $(ls $SCRIPT_DIR/provisions/*.mobileprovision);
+    for p in $SCRIPT_DIR/provisions/*.mobileprovision;
     do
         cp "$p" "$HOME/Library/MobileDevice/Provisioning Profiles/"
         echo "${p##*/} imported"
@@ -72,9 +74,9 @@ delete_provisions ()
     fi
 
     local p
-    for p in $(ls $SCRIPT_DIR/provisions);
+    for p in $SCRIPT_DIR/provisions;
     do
-        rm "$HOME/Library/MobileDevice/Provisioning Profiles/$p"
+        rm "$HOME/Library/MobileDevice/Provisioning Profiles/${p##*/}"
     done
 }
 

update_version

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
-update_version ()
-{
+update_version() {
     local version=$1
 
     if ! echo "$version" | grep -q -E '^[0-9]+(\.[0-9]+){2}$'
@@ -10,7 +9,7 @@ update_version ()
         exit 1
     fi
 
-    xcrun agvtool new-marketing-version $version
+    xcrun agvtool new-marketing-version "$version"
 }
 
 export -f update_version