2 files changed, 8 insertions, 2 deletions
diff --git a/lib/common b/lib/common
index b52da43..369f0be 100755
--- a/lib/common
+++ b/lib/common
@@ -289,11 +289,17 @@ find_resolver() {
 }
 
 #####################################################################
+# Values
+
+key_expr="[a-zA-Z][-_a-zA-Z0-9]*"
+
+#####################################################################
 # Common init
 
 # Add the app-* apps to PATH. They're added last to allow the user to
 # overload their implementations.
-PATH=$PATH:$APPSH_HOME/bin:$APPSH_HOME/libexec
+# Ideally we should parse the path here and remove duplicates.
+PATH=$APPSH_HOME:$APPSH_HOME/bin:$APPSH_HOME/libexec:$PATH
 
 # Make sure that $HOME is present to prevent unbound errors
 HOME=${HOME:-}
diff --git a/lib/header b/lib/header
index 805e06e..876750f 100644
--- a/lib/header
+++ b/lib/header
@@ -3,6 +3,6 @@
 set -e
 set -u
 
-APPSH_HOME=$(cd $(dirname "$0")/.. && pwd)
+export APPSH_HOME=$(cd $(dirname "$0")/.. && pwd)
 
 . $APPSH_HOME/lib/common