Merge lp:~mvo/snappy/snappy-binary-ld-library-path-wrapper into lp:~snappy-dev/snappy/snappy-moved-to-github

[Michael Vogt]

A small branch that sets up the LD_LIBRARY_PATH in the wrapper to make
it easier for the developer

[Sergio Schvezov (sergiusens)]

review: Needs Information

Unmerged revisions

228. By Michael Vogt on 2015-03-11

use the bin-path instead of the pkgpath in the LD_LIBRARY_PATH wrapper

227. By Michael Vogt on 2015-03-11

setup LD_LIBRARY_PATH in the wrapper

=== modified file 'snappy/click.go'
--- snappy/click.go	2015-03-10 13:31:42 +0000
+++ snappy/click.go	2015-03-11 11:09:28 +0000
@@ -353,6 +353,9 @@
 fi
 export HOME="$SNAP_APP_USER_DATA_PATH"
 
+# convinience for the developer
+LD_LIRARY_PATH=$LD_LIBRARY_PATH:{{.BinPath}}:{{.Path}}lib/$SNAPPY_APP_ARCH
+
 # export old pwd
 export SNAP_OLD_PWD="$(pwd)"
 cd {{.Path}}
@@ -365,10 +368,11 @@
 	wrapperData := struct {
 		packageYaml
 		Target    string
+		BinPath   string
 		Path      string
 		AaProfile string
 	}{
-		*m, actualBinPath, pkgPath, aaProfile,
+		*m, actualBinPath, filepath.Dir(actualBinPath), pkgPath, aaProfile,
 	}
 	t.Execute(&templateOut, wrapperData)
 

=== modified file 'snappy/click_test.go'
--- snappy/click_test.go	2015-03-10 07:41:06 +0000
+++ snappy/click_test.go	2015-03-11 11:09:28 +0000
@@ -352,6 +352,9 @@
 fi
 export HOME="$SNAP_APP_USER_DATA_PATH"
 
+# convinience for the developer
+LD_LIRARY_PATH=$LD_LIBRARY_PATH:/apps/pastebinit.mvo/1.4.0.0.1/bin:/apps/pastebinit.mvo/1.4.0.0.1/lib/$SNAPPY_APP_ARCH
+
 # export old pwd
 export SNAP_OLD_PWD="$(pwd)"
 cd /apps/pastebinit.mvo/1.4.0.0.1/