From 3de53bcda2721368fb66f94e4d4854195bd5ecce Mon Sep 17 00:00:00 2001
From: Ilan Cosman <ilancosman@gmail.com>
Date: Fri, 22 May 2020 18:31:00 -0700
Subject: [PATCH] Combine dev_install and tide_install, remove extra files

---
 dev/tide_dev_install.fish | 33 --------------------------
 gif.fish                  |  9 -------
 install.fish              | 50 ++++++++++++++++++++++-----------------
 3 files changed, 28 insertions(+), 64 deletions(-)
 delete mode 100644 dev/tide_dev_install.fish
 delete mode 100644 gif.fish

diff --git a/dev/tide_dev_install.fish b/dev/tide_dev_install.fish
deleted file mode 100644
index 6f03956..0000000
--- a/dev/tide_dev_install.fish
+++ /dev/null
@@ -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
\ No newline at end of file
diff --git a/gif.fish b/gif.fish
deleted file mode 100644
index 5993aea..0000000
--- a/gif.fish
+++ /dev/null
@@ -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'
diff --git a/install.fish b/install.fish
index 4fa2c0a..7091778 100644
--- a/install.fish
+++ b/install.fish
@@ -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