Merge lp:~mvo/snappy-hub/snappy-examples-new-env-vars into lp:~snappy-dev/snappy-hub/snappy-examples

[Michael Vogt]

Update the examples for the new snappy environment variables

=== modified file 'config-example-bash/bin/hello'
--- config-example-bash/bin/hello	2015-05-29 08:24:53 +0000
+++ config-example-bash/bin/hello	2016-01-15 08:23:07 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [ -e ${SNAP_APP_DATA_PATH}/message ]; then
-    cat ${SNAP_APP_DATA_PATH}/message
+if [ -e ${SNAP_DATA}/message ]; then
+    cat ${SNAP_DATA}/message
 else
     cat <<EOF2
 Hello from the bash config example!

=== modified file 'config-example-bash/meta/hooks/config'
--- config-example-bash/meta/hooks/config	2015-03-28 16:31:12 +0000
+++ config-example-bash/meta/hooks/config	2016-01-15 08:23:07 +0000
@@ -7,12 +7,12 @@
 # read stdin with the "ypath" helper (if there is any input)
 CFG="$($HELPER /config/${SNAP_NAME}/msg 2>/dev/null || true)"
 if [ -n "$CFG" ]; then
-    printf "$CFG" > ${SNAP_APP_DATA_PATH}/message
+    printf "$CFG" > ${SNAP_DATA}/message
 fi
 
 # read existing message
-if [ -e "${SNAP_APP_DATA_PATH}/message" ]; then
-  msg=$(cat ${SNAP_APP_DATA_PATH}/message)
+if [ -e "${SNAP_DATA}/message" ]; then
+  msg=$(cat ${SNAP_DATA}/message)
 fi
 
 # output current config

=== modified file 'config-example/bin/hello'
--- config-example/bin/hello	2015-05-29 08:24:53 +0000
+++ config-example/bin/hello	2016-01-15 08:23:07 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-if [ -e ${SNAP_APP_DATA_PATH}/message ]; then
-    cat ${SNAP_APP_DATA_PATH}//message
+if [ -e ${SNAP_DATA}/message ]; then
+    cat ${SNAP_DATA}/message
 else
     cat <<EOF2
 Hello from the config example!

=== modified file 'config-example/meta/hooks/config'
--- config-example/meta/hooks/config	2015-05-29 08:24:53 +0000
+++ config-example/meta/hooks/config	2016-01-15 08:23:07 +0000
@@ -5,7 +5,7 @@
 import yaml
 
 PKGNAME = "config-example"
-MSG_FILE = os.path.join(os.environ["SNAP_APP_DATA_PATH"], "message")
+MSG_FILE = os.path.join(os.environ["SNAP_DATA"], "message")
 
 
 def get_config():

=== modified file 'go-example-webserver/magic-bin/go-example-webserver'
--- go-example-webserver/magic-bin/go-example-webserver	2015-05-21 19:48:45 +0000
+++ go-example-webserver/magic-bin/go-example-webserver	2016-01-15 08:23:07 +0000
@@ -24,15 +24,9 @@
     ;;
 esac
 
-# workaround that snappy services have bogus SNAP_ vars set; assume PWD is right
-echo "$SNAP_APP_PATH" | grep -q SNAP_APP && SNAP_APP_PATH=$PWD
-if test -z "$SNAP_APP_PATH"; then
-  SNAP_APP_PATH=$PWD
-fi
-
 snapp_bin_path=$0
 snapp_bin=`basename $snapp_bin_path`
-snapp_dir=$SNAP_APP_PATH
+snapp_dir=$SNAP
 snapp_name=`echo $snapp_bin | sed -e 's/\(.*\)[.]\([^.]*\)$/\1/g'`
 snapp_org_bin=`echo $snapp_bin | sed -e 's/\(.*\)[.]\([^.]*\)$/\2/g'`
 

=== modified file 'hello-dbus/package-dir-app/bin/dbus_message.client'
--- hello-dbus/package-dir-app/bin/dbus_message.client	2015-04-28 20:53:10 +0000
+++ hello-dbus/package-dir-app/bin/dbus_message.client	2016-01-15 08:23:07 +0000
@@ -1,8 +1,4 @@
 #!/bin/sh
 set -e
 
-if [ -z "$SNAPPY_APP_ARCH" ]; then
-    SNAPPY_APP_ARCH=`$SNAP_APP_PATH/bin/get_arch`
-fi
-
-$SNAP_APP_PATH/bin/dbus_message.$SNAPPY_APP_ARCH --system --name="com.canonical.hello-dbus-fwk" --type=method_call "/com/canonical/HelloDbusFramework/DbusSrv" "com.canonical.HelloDbusFramework.DbusSrv.Method"
+$SNAP/bin/dbus_message.$SNAP_ARCH --system --name="com.canonical.hello-dbus-fwk" --type=method_call "/com/canonical/HelloDbusFramework/DbusSrv" "com.canonical.HelloDbusFramework.DbusSrv.Method"

=== modified file 'hello-dbus/package-dir-fwk/bin/dbus_service.start'
--- hello-dbus/package-dir-fwk/bin/dbus_service.start	2015-04-28 20:53:10 +0000
+++ hello-dbus/package-dir-fwk/bin/dbus_service.start	2016-01-15 08:23:07 +0000
@@ -1,8 +1,8 @@
 #!/bin/sh
 set -e
 
-if [ -z "$SNAPPY_APP_ARCH" ]; then
-    SNAPPY_APP_ARCH=`$SNAP_APP_PATH/bin/get_arch`
+if [ -z "$SNAP_ARCH" ]; then
+    SNAP_ARCH=`$SNAP/bin/get_arch`
 fi
 
-$SNAP_APP_PATH/bin/dbus_service.$SNAPPY_APP_ARCH --system --name="com.canonical.hello-dbus-fwk" "/com/canonical/HelloDbusFramework/DbusSrv" "com.canonical.HelloDbusFramework.DbusSrv"
+$SNAP/bin/dbus_service.$SNAP_ARCH --system --name="com.canonical.hello-dbus-fwk" "/com/canonical/HelloDbusFramework/DbusSrv" "com.canonical.HelloDbusFramework.DbusSrv"

=== modified file 'hello-dbus/src/Makefile'
--- hello-dbus/src/Makefile	2015-04-28 20:53:10 +0000
+++ hello-dbus/src/Makefile	2016-01-15 08:23:07 +0000
@@ -4,7 +4,7 @@
 # make
 # make install
 
-# This should match SNAP_APP_ARCH
+# This should match SNAP_ARCH
 BUILD_ARCH := $(shell dpkg-architecture | grep DEB_BUILD_ARCH= | cut -f 2 -d '=')
 
 CFLAGS += -g -O0 -Wall -Wstrict-prototypes

=== modified file 'hello-world/bin/showdev'
--- hello-world/bin/showdev	2015-04-22 16:59:33 +0000
+++ hello-world/bin/showdev	2016-01-15 08:23:07 +0000
@@ -10,7 +10,7 @@
 
 find $findargs
 
-APPNAME=`echo $SNAP_APP_PATH | cut -f 3 -d '/'`
+APPNAME=`echo $SNAP | cut -f 3 -d '/'`
 echo ""
 echo "Here is hardware that has been assigned to me ($APPNAME):"
 udevadm trigger --verbose --dry-run --tag-match=snappy-assign --property-match=SNAPPY_APP="$APPNAME"

=== modified file 'hello-world/bin/usehw'
--- hello-world/bin/usehw	2015-04-22 18:26:34 +0000
+++ hello-world/bin/usehw	2016-01-15 08:23:07 +0000
@@ -6,7 +6,7 @@
 echo "This example demonstrates the app confinement for assigned hardware"
 echo ""
 
-APPNAME=`echo $SNAP_APP_PATH | cut -f 3 -d '/'`
+APPNAME=`echo $SNAP | cut -f 3 -d '/'`
 if [ -z "$APPNAME" ]; then
     echo "Could not determine application name."
     exit 1