Fix shell integration in headless mode

bin/shell-integration.fish

@@ -2,8 +2,13 @@
 
 function sodalite-widget 
   set target (sodalite)
-  [ -d $target ] ;or set target (dirname $target)
-  cd $target
+  if [ $target ]
+      [ -d $target ] ;or set target (dirname $target)
+      cd $target
+  end
+  if not [ $DESKTOP ]
+    clear
+  end
   commandline -f repaint
 end
 

bin/shell-integration.sh

@@ -1,9 +1,20 @@
 # sodalite shell integration
 
+function headless_clear {
+    [ $DESKTOP ] || clear
+}
+
+function setup_cleanup {
+    trap headless_clear EXIT SIGTERM SIGINT
+}
+
 function sodalite-emacs-widget {
+    setup_cleanup
     target="$(sodalite)"
-    [ -d "$target" ] || target="$(dirname $target)"
-    cd "$target"
+    if [ $target ]; then
+        [ -d "$target" ] || target="$(dirname $target)"
+        cd "$target"
+    fi
     zle reset-prompt
 }
 
@@ -19,6 +30,6 @@ if [ $shell = 'zsh' ]; then
     bindkey -M vicmd 'f'  sodalite-vim-widget
     bindkey -M emacs '^f' sodalite-emacs-widget
 elif [ $shell = 'bash' ]; then
-    bind -m vi-command '"f":"ddicd $(sodalite); tput cuu1; tput ed\n"'
-    bind -m emacs '"\C-f":"\C-k\C-ucd $(sodalite); tput cuu1; tput ed\n"'
+    bind -m vi-command '"f":"ddisetup_cleanup; cd $(sodalite); tput cuu1; tput ed\n"'
+    bind -m emacs '"\C-f":"\C-k\C-usetup_cleanup; cd $(sodalite); tput cuu1; tput ed\n"'
 fi

bin/sodalite

@@ -1,5 +1,13 @@
 #!/bin/bash  
 
+
+function reset {
+    # enable control flow keys
+    stty ixany 2> /dev/null
+}
+
+trap reset SIGINT SIGTERM
+
 # disable control flow keys
 stty -ixon 2> /dev/null
 
@@ -18,5 +26,3 @@ python3 $LIB_DIR/main.py < /dev/tty > /dev/tty
 read <&3 line
 [ $line ] && echo "$line"
 
-# enable control flow keys
-stty ixany 2> /dev/null

changelog.md

@@ -6,7 +6,8 @@
 ##### Bugfixes
 - Prevent race conditions while drawing to screen
 - Make sodalite-open script (xdg-open wrapper) more robust
-
+- Fix opening files when running headless
+- Enhance shell integration when running headless
 
 ## v0.9: June 02, 2018
 ##### Features