Переглянути джерело

Fix fish existing with PID active for fasd

Colin Powell 6 роки тому
батько
коміт
9fc8b81fce

+ 6 - 4
config/fish/conf.d/__fasd_run.fish

@@ -1,4 +1,6 @@
-  function __fasd_run -e fish_preexec -d "fasd takes record of the directories changed into"
-    command fasd --proc (command fasd --sanitize "$argv") > "/dev/null" 2>&1 &
-  end
-  
+function __fasd_run -e fish_preexec -d "fasd takes record of the directories changed into"
+    if test $argv[1] != "exit"
+        command fasd --proc (command fasd --sanitize "$argv") > "/dev/null" 2>&1 &
+    end
+end
+  

+ 8 - 0
config/fish/conf.d/plugin-direnv_init.fish

@@ -0,0 +1,8 @@
+if type -q direnv
+  function __direnv_export_eval --on-variable PWD
+    status --is-command-substitution; and return
+    eval (direnv export fish)
+  end
+else
+  echo "Install direnv first! Check http://direnv.net" ^&1
+end

+ 1 - 0
config/fish/fishfile

@@ -5,3 +5,4 @@ fishgretel/fasd
 asdf-vm/asdf
 edc/bass
 oh-my-fish/theme-mtahmed
+oh-my-fish/plugin-direnv

+ 1 - 1
config/fish/functions/de.fish

@@ -1,5 +1,5 @@
 function de
-	pushd ~/devel/elationemr/hippo
+	pushd ~/devel/elationemr/hippo-local
 	docker-compose $argv
 	popd
 end

+ 3 - 0
config/fish/functions/wanip.fish

@@ -0,0 +1,3 @@
+function wanip
+	dig +short myip.opendns.com @resolver1.opendns.com
+end

+ 1 - 0
gitignore

@@ -27,3 +27,4 @@ package-lock.json
 .rest
 ._*
 .stignore
+local-config.diff