fixup! Add packcheck-remote to work with remote repositories directly

Author: adithyaov

README.md

@@ -199,8 +199,9 @@ $ ./packcheck-safe.sh cabal-v2 PATH=/bin:/usr/bin:/opt/ghc/bin
 
 ## packcheck-remote
 
-`packcheck-remote.sh` is a wrapper over `packcheck.sh`. It makes it easer to
-work with remote repositories.
+`packcheck-remote.sh` is a wrapper over `packcheck.sh`. It allows you to run
+packcheck on a remote repository by cloning it locally and optionally merging a
+branch into another branch (e.g. a merging a PR branch into master).
 
 ```
 $ ./packcheck-remote.sh --force \

packcheck-remote.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PACKCHECK_DIR="$(dirname $0)"
+PACKCHECK_DIR=$(dirname "$0")
 PACKCHECK_EXE="$PACKCHECK_DIR/packcheck.sh"
 PWD="$(pwd)"
 DEFAULT_DIRECTORY_NAME="packcheck-remote-work"
@@ -20,19 +20,21 @@ which_cmd() {
 
 # $1: executable (eg. git)
 require_cmd () {
-    if test -z "$(which_cmd $1)"
+    local cmd_path
+    cmd_path=$(which_cmd "$1")
+    if test -z "$cmd_path"
     then
         echo "Required command [$1] not found in PATH [$PATH]."
         exit 1
     else
-        echo "Using [$1] at [$(which_cmd $1)]"
+        echo "Using [$1] at [$cmd_path]"
     fi
 }
 
 # $1: command
 function run_verbose() {
-    echo "$*"
-    bash -c "$*"
+    echo "$1"
+    bash -c "$1"
 }
 
 # $1: Remote repository
@@ -98,16 +100,13 @@ try_git_clone_and_merge() {
 
     if test -n "$merge"
     then
-        # This will fail is there are any merge conflicts
+        # This will fail if there are any merge conflicts
         run_verbose "git merge -X theirs $merge --no-edit --commit" || exit 1
     fi
 
     show_step "Running packcheck"
     # Run packcheck here
     run_verbose "$PACKCHECK_EXE $packcheck_cli_opts"
-
-    # Go back to where the script was executed from
-    cd "$PWD" || exit 1
 }
 
 # Arguments for the command line
@@ -116,10 +115,12 @@ REMOTE=""
 CHECKOUT=""
 MERGE=""
 DIRECTORY=""
+PACKCHECK_CLI_OPTS_ARR=()
 PACKCHECK_CLI_OPTS=""
 
 function run_help() {
-    local script=$(basename $0)
+    local script
+    script=$(basename "$0")
 
     echo
     echo "USAGE: --option[=value]"
@@ -177,7 +178,7 @@ do
             ;;
         --)
             shift
-            PACKCHECK_CLI_OPTS=$@
+            PACKCHECK_CLI_OPTS_ARR=("$@")
             break
             ;;
         *)
@@ -188,4 +189,20 @@ do
     esac
 done
 
+for i in "${PACKCHECK_CLI_OPTS_ARR[@]}"
+do
+    case $i in
+        *=*)
+            key=${1%%=*}
+            val=${1#*=}
+            PACKCHECK_CLI_OPTS="$PACKCHECK_CLI_OPTS $key=\"$val\""
+            shift
+            ;;
+        *)
+            PACKCHECK_CLI_OPTS="$PACKCHECK_CLI_OPTS $i"
+            shift
+            ;;
+    esac
+done
+
 try_git_clone_and_merge "$REMOTE" "$CHECKOUT" "$MERGE" "$DIRECTORY" "$FORCE" "$PACKCHECK_CLI_OPTS"