added custom bin option

warrensbox · Sep 18, 2020 · 8e5d827 · 8e5d827
1 parent 0b99697
commit 8e5d827
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -34,10 +34,10 @@ Installation for other linux operation systems.
 curl -L https://github.com/raw/warrensbox/terraform-switcher/release/install.sh | bash
 ```
 
-### Snap for CentOS, Ubuntu, Linux Mint, RHEL, Debian, Fedora
+### Snapcraft for CentOS, Ubuntu, Linux Mint, RHEL, Debian, Fedora
 
 ```sh
-snap install --edge tfswitch
+sudo snap install tfswitch
 ```
 
 
@@ -167,9 +167,9 @@ cd(){
 echo "Installing tfswitch locally"
 wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
 chmod 755 install.sh
-./install.sh -b bin-directory
+./install.sh -b `pwd`/.bin
 
-./bin-directory/tfswitch
+`pwd`/.bin/tfswitch
 ```
 
 If you have limited permission, try:
@@ -180,13 +180,13 @@ If you have limited permission, try:
 echo "Installing tfswitch locally"
 wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
 chmod 755 install.sh
-./install.sh -b bin-directory
+./install.sh -b `pwd`/.bin
 
-CUSTOMBIN=`pwd`/bin             #set custom bin path
+CUSTOMBIN=`pwd`/.bin             #set custom bin path
 mkdir $CUSTOMBIN                #create custom bin path
 export PATH=$PATH:$CUSTOMBIN    #Add custom bin path to PATH environment
 
-./bin-directory/tfswitch -b $CUSTOMBIN/terraform 0.11.7
+`pwd`/.bin/tfswitch -b $CUSTOMBIN/terraform 0.11.7
 
 terraform -v                    #testing version
 ```
@@ -219,13 +219,13 @@ jobs:
 
             wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
             chmod 755 install.sh
-            ./install.sh -b bin-directory
+            ./install.sh -b $HOME/.bin 
+
+            CUSTOMBIN=$HOME/.bin             #set custom bin path
 
-            CUSTOMBIN=`pwd`/bin             #set custom bin path
-            mkdir $CUSTOMBIN                #create custom bin path
             export PATH=$PATH:$CUSTOMBIN    #Add custom bin path to PATH environment
 
-            ./bin-directory/tfswitch -b $CUSTOMBIN/terraform 0.11.7
+            $CUSTOMBIN/tfswitch -b $CUSTOMBIN/terraform 0.11.7 #or simply tfswitch -b $CUSTOMBIN/terraform 0.11.7
 
             terraform -v                    #testing version
 ```

diff --git a/www/docs/Continuous-Integration.md b/www/docs/Continuous-Integration.md
@@ -1,16 +1,17 @@
 ### Jenkins setup
-<img src="https://s3.us-east-2.amazonaws.com/kepler-images/warrensbox/tfswitch/jenkins_tfswitch.png" alt="drawing" style="width: 370px;"/>
+<img src="https://s3.us-east-2.amazonaws.com/kepler-images/warrensbox/tfswitch/jenkins_tfswitch.png" alt="drawing" style="width: 170px;"/>
 
 ```sh
 #!/bin/bash 
 
 echo "Installing tfswitch locally"
 wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
 chmod 755 install.sh
-./install.sh -b bin-directory
+./install.sh -b `pwd`/.bin
 
-./bin-directory/tfswitch
+`pwd`/.bin/tfswitch
 ```
+
 If you have limited permission, try:
 
 ```sh
@@ -19,13 +20,13 @@ If you have limited permission, try:
 echo "Installing tfswitch locally"
 wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
 chmod 755 install.sh
-./install.sh -b bin-directory
+./install.sh -b `pwd`/.bin
 
-CUSTOMBIN=`pwd`/bin             #set custom bin path
+CUSTOMBIN=`pwd`/.bin             #set custom bin path
 mkdir $CUSTOMBIN                #create custom bin path
 export PATH=$PATH:$CUSTOMBIN    #Add custom bin path to PATH environment
 
-./bin-directory/tfswitch -b $CUSTOMBIN/terraform 0.11.7
+`pwd`/.bin/tfswitch -b $CUSTOMBIN/terraform 0.11.7
 
 terraform -v                    #testing version
 ```
@@ -58,13 +59,13 @@ jobs:
 
             wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
             chmod 755 install.sh
-            ./install.sh -b bin-directory
+            ./install.sh -b $HOME/.bin 
+
+            CUSTOMBIN=$HOME/.bin             #set custom bin path
 
-            CUSTOMBIN=`pwd`/bin             #set custom bin path
-            mkdir $CUSTOMBIN                #create custom bin path
             export PATH=$PATH:$CUSTOMBIN    #Add custom bin path to PATH environment
 
-            ./bin-directory/tfswitch -b $CUSTOMBIN/terraform 0.11.7
+            $CUSTOMBIN/tfswitch -b $CUSTOMBIN/terraform 0.11.7 #or simply tfswitch -b $CUSTOMBIN/terraform 0.11.7
 
             terraform -v                    #testing version
 ```
diff --git a/www/docs/Troubleshoot.md b/www/docs/Troubleshoot.md
@@ -21,14 +21,35 @@ Solution: You probably need to have privileges to install *tfswitch* at /usr/loc
 Try the following:
 
 ```sh
-wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
-chmod 755 install.sh
-./install.sh -b bin-directory
+wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh  #Get the installer on to your machine:
+
+chmod 755 install.sh #Make installer executable
+
+./install.sh -b $HOME/.bin #Install tfswitch in a location you have permission:
+
+$HOME/.bin/tfswitch #test
+
+export PATH=$PATH:$HOME/.bin #Export your .bin into your path
+
+#You should probably add step 4 in your `.bash_profile` in your $HOME directory.
+
+#Next, try:
+`tfswitch -b $HOME/.bin/terraform 0.11.7` 
+
+#or simply 
+
+`tfswitch -b $HOME/.bin/terraform`
+
 
-./bin-directory/tfswitch
 ```
 
-Or, use the custom directory option `-b`:    
+See the custom directory option `-b`:    
 <img src="https://s3.us-east-2.amazonaws.com/kepler-images/warrensbox/tfswitch/tfswitch-v7.gif" alt="drawing" style="width: 670px;"/>    
 
+```sh
+wget https://github.com/raw/warrensbox/terraform-switcher/release/install.sh 
+chmod 755 install.sh
+./install.sh -b $HOME/.bin
 
+$HOME/.bin/tfswitch
+```