Merge pull request #10 from chvolkmann/chvolkmann/issue9

Unify installers

Author: chvolkmann

README.md

@@ -43,7 +43,7 @@ With [fisher](https://github.com/jorgebucaran/fisher)
 fisher install chvolkmann/code-connect
 ```
 
-This downloads [`code_connect.py`](./functions/code_connect.py) along with two functions. See [`functions/code.fish`](./functions/code.fish) and [`functions/code-connect.fish`](./functions/code-connect.fish)
+This downloads [`code_connect.py`](./bin/code_connect.py) along with two functions. See [`functions/code.fish`](./functions/code.fish) and [`functions/code-connect.fish`](./functions/code-connect.fish)
 
 You can autocomplete the repository name in subsequent commands, e.g. `fisher update code<TAB>`
 
@@ -69,7 +69,7 @@ With [`bash/install.sh`](./bash/install.sh)
 curl -sS https://raw.githubusercontent.com/chvolkmann/code-connect/main/bash/install.sh | bash
 ```
 
-This downloads [`code_connect.py`](./functions/code_connect.py) along with two scripts and sets up aliases in your `.bashrc` for you. See [`bash/code.sh`](./bash/code.sh) and [`bash/code-connect.sh`](./bash/code-connect.sh)
+This downloads [`code_connect.py`](./bin/code_connect.py) along with two scripts and sets up aliases in your `.bashrc` for you. See [`bash/code.sh`](./bash/code.sh) and [`bash/code-connect.sh`](./bash/code-connect.sh)
 
 #### Uninstalling
 

bash/code-connect.sh

@@ -5,5 +5,4 @@
 # Use this script through an alias
 #   alias code-connect="/path/to/code-connect.sh"
 
-_CODE_CONNECT_PY="$(dirname \"$0\")"/code_connect.py
-$_CODE_CONNECT_PY $@
+~/.code-connect/bin/code_connect.py $@

bash/code.sh

@@ -11,5 +11,5 @@ if test -n "$local_code_executable"; then
     $local_code_executable $@
 else
     # code not locally installed, use code-connect
-    code-connect $@
+    ~/.code-connect/bin/code_connect.py $@
 fi

bash/install.sh

@@ -86,9 +86,9 @@ print ""
 
 # Download the required files from the repository
 
-mkdir -p "$CODE_CONNECT_INSTALL_DIR/lib"
+mkdir -p "$CODE_CONNECT_INSTALL_DIR/bin"
 
-CODE_CONNECT_PY="$CODE_CONNECT_INSTALL_DIR/lib/code_connect.py"
+CODE_CONNECT_PY="$CODE_CONNECT_INSTALL_DIR/bin/code_connect.py"
 download-repo-file "functions/code_connect.py" $CODE_CONNECT_PY
 chmod +x "$CODE_CONNECT_PY"
 

functions/code_connect.py renamed to bin/code_connect.py

@@ -0,0 +1,17 @@
+#!/usr/bin/fish
+
+# https://github.com/chvolkmann/code-connect
+
+function _on_code-connect_install --on-event code-connect_install
+    mkdir -p ~/.code-connect/bin
+    curl -sS "https://raw.githubusercontent.com/chvolkmann/code-connect/main/bin/code_connect.py" >~/.code-connect/bin/code_connect.py
+    chmod +x ~/.code-connect/bin/code_connect.py
+end
+
+function _on_code-connect_update --on-event code-connect_update
+    _on_code-connect_install
+end
+
+function _on_code-connect_uninstall --on-event code-connect_uninstall
+    rm -rf ~/.code-connect
+end

conf.d/code-connect.fish

@@ -3,8 +3,6 @@
 # https://github.com/chvolkmann/code-connect
 
 function code-connect --description 'Run Visual Studio Code through code-connect'
-    # absolute path to code_connect.py
-    set -l _CODE_CONNECT_PY (dirname (realpath (status --current-filename)))/code_connect.py
-
-    $_CODE_CONNECT_PY $argv
+    # alias for code_connect.py
+    ~/.code-connect/bin/code_connect.py $argv
 end