Bugfixes in generator

noccy80 · Dec 15, 2016 · 0e59446 · 0e59446
1 parent 9adb4d9
commit 0e59446
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/bin/phpl-generate b/bin/phpl-generate
@@ -13,9 +13,10 @@ function print_help() {
     printf("\n");
 }
 
-$opts = cmdl_parse("hr:",[
+$opts = cmdl_parse("hd:s:",[
     "h" =>  "help",
-    "r" =>  "read:",
+    "d" =>  "dir:",
+    "s" =>  "status:",
 ]);
 
 if (cmdl_get($opts,'help')) {

diff --git a/modules/status.php b/modules/status.php
@@ -16,7 +16,7 @@ function _status(array $opts=[]) {
     $character = (posix_getuid()==0)?$opts[STATUS_CHARACTER_ROOT]:$opts[STATUS_CHARACTER];
     $style = (LAST_STATUS)?$opts[STATUS_STYLE_BAD]:$opts[STATUS_STYLE_GOOD];
 
-    return panel( $character, [ 'class' => (LAST_STATUS?'bad':'good') ], 'status' );
+    return panel( $character, [ 'class' => ((LAST_STATUS>0)?'bad':'good') ], 'status' );
 }
 
 module("status", "Command status and root indicator");
diff --git a/powerline.sh b/powerline.sh
@@ -1,8 +1,9 @@
 
 
 function _updateprompt {
+    export LAST=$?
     export BASH_CWD="$(pwd)"
-    export PS1="$(phpl-generate -s $? -d $BASH_CWD) "
+    export PS1="$(phpl-generate -s $LAST -d $BASH_CWD) "
 }
 
 export PROMPT_COMMAND="_updateprompt"