- Refactor setup script for a more polite autocomplete location

Author: DannyBen

.github/workflows/test.yml

@@ -6,19 +6,38 @@ on:
 jobs:
   test:
     name: Run test suite
-
     runs-on: ubuntu-latest
-
     steps:
     - name: Checkout code
       uses: actions/checkout@v2
-
     - name: Run shellcheck tests
-      run: shellcheck rush
-
+      run: shellcheck rush setup
     - name: Build container for approval tests
       run: docker-compose build
-
     - name: Run approval tests
       run: docker-compose run ci
 
+  ubuntu_setup:
+    name: Setup on Ubuntu
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Run setup
+      run: ./setup
+    - name: Test setup artifacts
+      run: test/setup_artifacts
+
+  macos_setup:
+    name: Setup on macOS
+    runs-on: macos-latest
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v2
+    - name: Upgrade the outdated bash
+      run: brew install bash
+    - name: Run setup
+      run: ./setup
+    - name: Test setup artifacts
+      run: test/setup_artifacts
+

README.md

@@ -46,7 +46,8 @@ Installation
 
 ### Installing using the setup script
 
-This setup script simply downloads the rush executable to `/usr/local/bin/`.
+This setup script will download the rush executable to `/usr/local/bin/` and
+install an autocomplete script in the bash completions directory.
 
 ```shell
 $ bash <(curl -Ls get.dannyb.co/rush/setup)
@@ -60,9 +61,6 @@ Feel free to inspect the [setup script](setup) before running.
 Download the [rush](rush) script to `/usr/local/bin/` or anywhere in your
 `PATH`, and make it executable.
 
-
-### Installing auto-completion script
-
 If you wish to have all package name auto-completed for all `rush` commands, 
 add this line to your startup script (for example: `~/.bashrc`):
 

rush

@@ -1,21 +1,39 @@
 #!/usr/bin/env bash
-echo "Downloading to /usr/local/bin/rush"
 
+# Figure out if we need sudo or not
+sudo=''
+if [[ $EUID -ne 0 ]]; then
+  sudo='sudo'
+fi
+
+# Download script from Github
+echo "=== Saving executable to /usr/local/bin/op"
 curl_command="curl -s https://raw.githubusercontent.com/DannyBen/rush-cli/master/rush > /usr/local/bin/rush"
+$sudo bash -c "$curl_command"
+$sudo chmod a+x /usr/local/bin/rush
 
-if [[ $EUID -ne 0 ]]; then
-  # not root, need sudo
-  sudo bash -c "$curl_command"
-  sudo chmod a+x /usr/local/bin/rush
+# Install completions
+if [[ -d "/usr/share/bash-completion/completions" ]]; then
+  compdir="/usr/share/bash-completion/completions"
+elif [[ -d "/usr/local/etc/bash_completion.d" ]]; then
+  compdir="/usr/local/etc/bash_completion.d"
+else
+  compdir=''
+fi
+
+if [[ -n $compdir ]]; then
+  echo "=== Installing autocompletions to $compdir"
+  echo "complete -W '$(rush list -s)' rush" | $sudo tee "${compdir}/rush" > /dev/null
 else
-  # root
-  bash -c "$curl_command"
-  chmod a+x /usr/local/bin/rush
+  echo "=== Completion script was not installed"
+  echo "    To install it manually add this to your startup script:"
+  echo "    complete -W '$(rush list -s)' rush"
 fi
 
+# Verify
 if type rush > /dev/null; then
-  echo "Done. Type 'rush --help' for more info."
+  echo "=== Done. Type 'rush --help' for more info."
 else
-  echo "Failed downloading."
+  echo "=== Setup failed."
   exit 1
 fi

setup

@@ -0,0 +1,34 @@
+#!/usr/bin/env bash
+set -e
+
+check_file() {
+  file="$1"
+  if [[ ! -f "$file" ]]; then
+    echo "ERROR: File not found $file"
+    exit 1
+  fi
+}
+
+get_comp_dir() {
+  if [[ -d "/usr/share/bash-completion/completions" ]]; then
+    echo "/usr/share/bash-completion/completions"
+  elif [[ -d "/usr/local/etc/bash_completion.d" ]]; then
+    echo "/usr/local/etc/bash_completion.d"
+  else
+    echo ''
+  fi
+}
+
+# Check that 'rush' is in its place
+check_file "/usr/local/bin/rush"
+
+# Check that completions file is in place
+compdir="$(get_comp_dir)"
+if [[ -d "$compdir" ]]; then
+  check_file "$compdir/rush"
+else
+  echo "ERROR: Cannot find compdir, completions not installed"
+  exit 1
+fi
+
+echo "Setup artifacts are OK"