diff --git a/README.md b/README.md index e49c423..af22108 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,13 @@ A list of available tools and their usages can be found on the [Documentation Pa Though most of the code is not written in JavaScript, I use the Node Package Manager to handle installing and script running, since it is familiar to many. -To install the toolset suite run: +To install the toolset run: + +```sh +npx -q https://github.com/kyle-west/bashful.git +``` + +To install without NPM run: ```sh # clone the suite installation package: @@ -21,15 +27,16 @@ git clone https://github.com/kyle-west/bashful.git cd bashful/ # run the installation -npm install +sh ./install.sh ``` -When this script completes, **you will be prompted to restart your terminal**. This +When either script completes, **you must restart your terminal**. This is because the installation edits your `$path` environment variable to make the tools accessible in all contexts. -Go ahead and delete the cloned repo. The programs will still work, and you -can later install/uninstall things with the `bashful` CLI. +### Installing / Uninstalling Tools + +`bashful` CLI has it's own installation management of tools, including gists. See the [Docs](https://kyle-west.github.io/bashful/bashful.html) for more info. ### Uninstalling the entire Suite diff --git a/docs/index.md b/docs/index.md index a1841ec..691b590 100644 --- a/docs/index.md +++ b/docs/index.md @@ -1,6 +1,6 @@ # BASHful Suite Tools - + ## [`bashful`](./bashful.md) diff --git a/install.sh b/install.sh index bb34c7d..6f82dc3 100644 --- a/install.sh +++ b/install.sh @@ -3,7 +3,7 @@ echo; # remove old suites echo Removing old suites -bash uninstall.sh +bash uninstall.sh uninstalled-as-prep-for-install __bash_suite_program_dir=~/.bashful __bash_suite_filesys=~/.bashful.filesys @@ -15,13 +15,12 @@ import_path_line='source ~/.bashful.filesys/bashful.rc' echo $import_path_line >> ~/.bash_profile; echo $import_path_line >> ~/.zshrc; echo Done -echo $PATH echo; # install tools echo Copying over programs: cp ./bin/* "$__bash_suite_program_dir/" -ls $__bash_suite_program_dir +echo -e "\t" `ls $__bash_suite_program_dir` echo Done echo; diff --git a/package.json b/package.json index 36d6f8d..d4c57de 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "bashful", - "version": "2.1.0", + "version": "2.2.0", "description": "Install my custom suite of terminal tools for Bash in OSX", "main": "install.sh", "scripts": { diff --git a/uninstall.sh b/uninstall.sh index 10ee14b..4d6633a 100644 --- a/uninstall.sh +++ b/uninstall.sh @@ -17,9 +17,11 @@ echo -e "$edited_profile" > ~/.zshrc; echo Done echo; -# prompt the user to restart terminal -echo; -echo BASHful Suite by kyle-west -echo Uninstall Complete -echo !!! Please restart your terminal to allow the changes to take effect !!! -echo; \ No newline at end of file +if [ "$1" != "uninstalled-as-prep-for-install" ]; then + # prompt the user to restart terminal + echo; + echo BASHful Suite by kyle-west + echo Uninstall Complete + echo !!! Please restart your terminal to allow the changes to take effect !!! + echo; +fi \ No newline at end of file