From ab0b7ff03cb9070643c2da14d33ca617ebe7606e Mon Sep 17 00:00:00 2001 From: ViViDboarder Date: Thu, 11 Feb 2016 18:35:43 -0800 Subject: [PATCH] A little bit of updates to fish configs --- assets/default/fisherman/.gitignore | 1 + .../default/fisherman/fisherman/cache/.index | 161 ------------------ assets/default/fisherman/fisherman/fishfile | 1 + master-cookbook | 2 + no-sudo | 21 ++- recipes/default/fisherman | 10 +- 6 files changed, 29 insertions(+), 167 deletions(-) create mode 100644 assets/default/fisherman/.gitignore delete mode 100644 assets/default/fisherman/fisherman/cache/.index diff --git a/assets/default/fisherman/.gitignore b/assets/default/fisherman/.gitignore new file mode 100644 index 0000000..e934adf --- /dev/null +++ b/assets/default/fisherman/.gitignore @@ -0,0 +1 @@ +cache/ diff --git a/assets/default/fisherman/fisherman/cache/.index b/assets/default/fisherman/fisherman/cache/.index deleted file mode 100644 index e30d6de..0000000 --- a/assets/default/fisherman/fisherman/cache/.index +++ /dev/null @@ -1,161 +0,0 @@ -autoenvstack -https://github.com/hutenosa/autoenvstack -Tree-based autoenv -env autoenv source autoenvfish cd set -hutenosa - -autoinit -https://github.com/fishery/autoinit -Add init_* event support -init emit events omf source -bucaran - -available -https://github.com/fishery/available -Check if a function or command is available -check test status clean type callable legacy compatibility -bucaran - -bass -https://github.com/edc/bass -Compatibility layer for bash utilities -tool bash fish script wrapper env -edc - -bobthefish -https://github.com/oh-my-fish/theme-bobthefish -Powerline, Git-aware prompt optimized for awesome -omf theme prompt powerline yellow green red glyphs git bob -bobthecow - -cmorrell -https://github.com/oh-my-fish/theme-cmorrell.com -Flat, Git-aware, left and right prompt -omf theme prompt flat git right git -inxilpro - -errno -https://github.com/oh-my-fish/plugin-errno -POSIX error code/string translator -omf posix errno strerror einval error code enavail -derekstavis - -fishtape -https://github.com/fishery/fishtape -TAP producer and test harness -test tool harness tap unit-testing -bucaran - -flash -https://github.com/fishery/flash -Flash-inspired, thunder red and yellow theme -theme prompt flash dc superhero red yellow thunder -bucaran - -get -https://github.com/fishery/get -Press any key to continue -stty read line ui cli key character -bucaran - -git-branch-name -https://github.com/fishery/git-branch-name -Get the current branch in a Git repository -git status info function compatibility -bucaran - -git-status -https://github.com/fishery/git-status -Git status query functions -git status info function compatibility -bucaran - -hulk -https://github.com/fishery/hulk -Hulk-inspired, powerful green theme -theme prompt hulk marvel superhero green purple fist -bucaran - -lambda -https://github.com/hasanozgan/theme-lambda -Multiline, git-ware lambda prompt -theme prompt multiline git lambda -hasanozgan - -legacy -https://github.com/fishery/legacy -Compatibility with Oh My Fish! -omf compatibility legacy -bucaran - -lolfish -https://github.com/er0/lolfish -Tmux-aware, rainbow gradient prompt -theme prompt tmux git rainbow multicolor color -er0 - -nelsonjchen -https://github.com/nelsonjchen/omf-theme-nelsonjchen -Git-aware, colorful re5et-inspired theme -theme prompt git tmux 12-hour omz re5et nelsonjchen -nelsonjchen - -pure -https://github.com/rafaelrinaldi/pure -Pretty, minimal and fast prompt -theme prompt minimal simple sindresorhus pure -rafaelrinaldi - -submit -https://github.com/fishery/submit -Submit a plugin to the index -fisherman contrib index plugin register db -bucaran - -shellder -https://github.com/simnalamburt/shellder -Powerline prompt optimized for speed -theme prompt powerline speed -simnalamburt - -scorphish -https://github.com/oh-my-fish/theme-scorphish -Hot, angle bracket-based multiline prompt -omf theme prompt multiline git angle -scorphus - -shark -https://github.com/fishery/shark -Fantastic Sparkline Generator -chart tool report sparkline graph -bucaran - -scaffold -https://github.com/fishery/scaffold -Scaffold out a fish plugin -create plugin generator boilerplate fish fisherman -bucaran - -tab -https://github.com/oh-my-fish/plugin-tab -Open new tabs from the command line -omf tab window terminal iterm console tool command -bobthecow - -technicolor -https://github.com/oh-my-fish/plugin-technicolor -Text colorization declarative DSL -omf color ansi set_color styles text -derekstavis - -title -https://github.com/oh-my-fish/plugin-title -Change the tab/window title string -omf window console title display customize titlebar -derekstavis - -vi-mode -https://github.com/oh-my-fish/plugin-vi-mode -Basic vi key bindings emulation -omf vi vim mode key bindings emulate python -syl20bnr diff --git a/assets/default/fisherman/fisherman/fishfile b/assets/default/fisherman/fisherman/fishfile index e69de29..8b13789 100644 --- a/assets/default/fisherman/fisherman/fishfile +++ b/assets/default/fisherman/fisherman/fishfile @@ -0,0 +1 @@ + diff --git a/master-cookbook b/master-cookbook index 1cdc8a2..607016f 100755 --- a/master-cookbook +++ b/master-cookbook @@ -117,10 +117,12 @@ fi if $install_ohmyfish ; then recipe 'oh-my-fish' + set_installed 'oh-my-fish' fi if $install_fisherman ; then recipe 'fisherman' + set_installed 'fisherman' fi ### Show the Finished banner diff --git a/no-sudo b/no-sudo index ebc64f0..1fabf4e 100755 --- a/no-sudo +++ b/no-sudo @@ -28,9 +28,19 @@ if prompt_yn "Install Salesforce tools?" ; then install_sfdc=true fi install_fish=false +install_ohmyfish=false +install_fisherman=false is_installed "fish" +is_installed "oh-my-fish" +is_installed "fisherman" if prompt_yn "Install fish?" ; then install_fish=true + + if prompt_yn "Install oh-my-fish?" ; then + install_ohmyfish=true + elif prompt_yn "Install Fisherman?" ; then + install_fisherman=true + fi fi ### Run recipes @@ -58,11 +68,20 @@ if $install_fish ; then recipe 'fish-install' fi if command_exist fish ; then - recipe 'fish-config' set_installed 'fish' fi fi +if $install_ohmyfish ; then + recipe 'oh-my-fish' + set_installed 'oh-my-fish' +fi + +if $install_fisherman ; then + recipe 'fisherman' + set_installed 'fisherman' +fi + ### Show the Finished banner finished diff --git a/recipes/default/fisherman b/recipes/default/fisherman index cd92f79..21636ac 100644 --- a/recipes/default/fisherman +++ b/recipes/default/fisherman @@ -2,15 +2,15 @@ if [ ! -d "$fisher_home" ]; then curl -L install.fisherman.sh | fish - rm -fr "$fisher_config" fi -try_link "${DEFAULT_ASSETS_PATH}/fisherman" "$HOME/.config/fisherman" +rm -fr "$XDG_CONFIG_HOME/fisherman" +try_link "${DEFAULT_ASSETS_PATH}/fisherman" "$XDG_CONFIG_HOME/fisherman" -add_line "source_config paths" ~/.config/fish/config.fish -add_line "source_config alias" ~/.config/fish/config.fish +add_line "source_config paths" $XDG_CONFIG_HOME/fish/config.fish +add_line "source_config alias" $XDG_CONFIG_HOME/fish/config.fish # Link functions for func in ${DEFAULT_ASSETS_PATH}/fish/functions/*.fish; do - try_link "$func" $HOME/.config/fish/functions/$(basename $func) + try_link "$func" $XDG_CONFIG_HOME/fish/functions/$(basename $func) done