Combine dev_install and tide_install, remove extra files

This commit is contained in:
Ilan Cosman 2020-05-22 18:31:00 -07:00
parent 2d366375e8
commit 3de53bcda2
3 changed files with 28 additions and 64 deletions

View File

@ -1,33 +0,0 @@
function tide_dev_install
argparse 'b/branch' 'l/local' -- $argv
if set -q _flag_branch
curl -s "https://raw.githubusercontent.com/IlanCosman/tide/$argv/install.fish" | source; and tide_install $argv
return $status
end
if set -q _flag_local
_local_install $argv
return $status
end
printf '%s' 'Please indicate local/branch'
return 1
end
function _local_install -a localRepo
if source "$localRepo/install.fish"
cp -r "$localRepo/conf.d" $__fish_config_dir
cp -r "$localRepo/functions" $__fish_config_dir
cp -r "$localRepo/tide_theme" $__fish_config_dir
cp -r "$localRepo/tests" $__fish_config_dir
cp -r "$localRepo/dev/." "$__fish_config_dir/functions"
_set_tide_defaults
_source_tide_functions
# Install fisher and fishtape for testing
curl https://git.io/fisher --create-dirs -sLo ~/.config/fish/functions/fisher.fish
fisher add jorgebucaran/fishtape
end
end

View File

@ -1,9 +0,0 @@
set -U tide_right_prompt_items 'status' 'jobs'
clear
Start recording
echo $tide_right_prompt_items
ssh localhost
awd123mnl4562
sleep 60 &
set -U tide_right_prompt_items 'status' 'jobs' 'context'
set -U tide_right_prompt_items 'status' 'jobs' 'newline' 'context'

View File

@ -1,42 +1,45 @@
function tide_install -a branch
if test -z "$branch"
set branch 'master'
function tide_install
argparse 'l/local' 'd/dev' -- $argv
set -l location $argv[1]
if test -z "$location"
set location 'master'
end
printf '%s\n' 'Installing tide theme...'
# -----------------Download Functions-----------------
# -----------------Download Files-----------------
set -l tempDir '/tmp/tide_theme'
# Clone repository into $tempDir
# Copy/clone repository into $tempDir
if test -e $tempDir
rm -rf $tempDir
end
git clone -q --depth=1 -b "$branch" https://github.com/IlanCosman/tide.git $tempDir
# Remove all files/dirs except functions and tide_theme
set -l keepFiles "$tempDir/"{'conf.d', 'functions', 'tide_theme'}
for file in $tempDir/*
if not contains $file $keepFiles
rm -rf $file
end
if set -q _flag_local
cp -rf "$location" "$tempDir"
else
git clone -q --depth=1 -b $location https://github.com/IlanCosman/tide.git $tempDir
end
rm -rf "$tempDir/.git"
cp -r "$tempDir/conf.d" $__fish_config_dir
cp -r "$tempDir/functions" $__fish_config_dir
cp -r "$tempDir/tide_theme" $__fish_config_dir
if set -q _flag_dev
cp -r "$tempDir/tests" $__fish_config_dir
cp -r "$tempDir/dev/." "$__fish_config_dir/functions"
end
# --------------------Set Defaults--------------------
# Add contents of conf.d and functions to a list for uninstallation
set -U _tide_file_list
for file in "$tempDir/"{conf.d/*, functions/*}
for file in $tempDir/{conf.d/*, functions/*}
if test "$file" != "$tempDir/functions/fish_prompt.fish"
set -a _tide_file_list (string replace "$tempDir/" '' $file)
end
end
# Copy remaining directory contents into $__fish_config_dir and ctideup
cp -rf "$tempDir/." $__fish_config_dir
rm -rf $tempDir
# --------------------Set Defaults--------------------
_set_tide_defaults
# -----------------------Finish-----------------------
@ -53,6 +56,8 @@ function tide_install -a branch
printf '%s\n'
printf '%s\n' 'Run tide configure to customize your prompt.'
end
rm -rf $tempDir
end
function _set_tide_defaults
@ -133,8 +138,9 @@ function _set -a var_name
end
function _source_tide_functions
source "$__fish_config_dir/conf.d/_tide_count_left_prompt_height.fish"
source "$__fish_config_dir/conf.d/_tide_cursor_movement.fish"
for file in $_tide_file_list
source "$__fish_config_dir/$file"
end
source "$__fish_config_dir/functions/fish_prompt.fish"
end