[gnome-sdk-images] Actually fix the xdg-app-helper use



commit 20fb97d083413e2adf565dadf57dfcd4a0d12eb6
Author: Alexander Larsson <alexl redhat com>
Date:   Tue Mar 24 13:32:08 2015 +0100

    Actually fix the xdg-app-helper use

 build.sh |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/build.sh b/build.sh
index e8a47a3..7303c78 100755
--- a/build.sh
+++ b/build.sh
@@ -4,7 +4,7 @@ BUILD=`pwd`/build
 CHROOT=$BUILD/chroot
 ROOT=$BUILD/root
 VAR=$BUILD/var
-SRC=`pwd`/
+SRC=`pwd`
 
 XDG_APP_HELPER=`which xdg-app-helper`
 LINUX_USER_CHROOT=`which linux-user-chroot`
@@ -32,9 +32,9 @@ fi
 echo "builduser:x:`id  -u`:`id -u`:Build user:/self/packages:/sbin/nologin" >> $ROOT/usr/etc/passwd
 echo "builduser:x:`id  -g`:" >> $ROOT/usr/etc/group
 
-if "x${XDG_APP_HELPER}" != "x"; then
-    $XDG_APP_HELPER -w -W -E -a $SRC -v $VAR $ROOT/usr env PATH="$PATH" "$@"
-else
+if test "x${XDG_APP_HELPER}" != "x"; then
+    $XDG_APP_HELPER -w -W -E -a $SRC -v $VAR $ROOT/usr env PATH="$PATH" /self/cd.sh "$@"
+elif test "x${LINUX_USER_CHROOT}" != "x"; then
     $LINUX_USER_CHROOT --unshare-ipc --unshare-pid --unshare-net --mount-bind /dev /dev --mount-proc /proc 
--mount-bind $ROOT/usr /usr --mount-bind $VAR /var --mount-bind $SRC /self --chdir /self $CHROOT "$@"
 else
     echo "No containment helper found"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]