From 7bb8f6710c94260f05f6d88910864e2b25484e6c Mon Sep 17 00:00:00 2001
From: Trygve Laugstøl <trygvis@inamo.no>
Date: Sun, 14 Oct 2012 09:43:38 +0200
Subject: o Setting a default PATH for postinstall.

---
 .app/lib/app-app | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

(limited to '.app/lib/app-app')

diff --git a/.app/lib/app-app b/.app/lib/app-app
index ae77298..c9da2d7 100644
--- a/.app/lib/app-app
+++ b/.app/lib/app-app
@@ -191,6 +191,12 @@ method_install() {
   echo "Unpacking..."
   unzip -q -d $name/$instance/versions/$resolved_version $zip_file
 
+  if [ ! -d $BASEDIR/$name/$instance/versions/$resolved_version/root ]
+  then
+    echo "Invalid zip file, did not contain a ./root directory." >&2
+    exit 1
+  fi
+
   (
     cd $name/$instance/versions/$resolved_version
     if [ -d scripts ]
@@ -203,7 +209,7 @@ method_install() {
       echo "Running postinstall..."
       set +e
       env -i \
-        PATH=$PATH \
+        PATH=/bin:/usr/bin \
         scripts/postinstall
       set -e
       ret=`echo $?`
@@ -220,10 +226,13 @@ method_install() {
   rm -f $BASEDIR/$name/$instance/current
   ln -s versions/$resolved_version/root $BASEDIR/$name/$instance/current
 
-  (
-    cd $name/$instance/current
-    find bin -type f | xargs chmod +x
-  )
+  if [ -d $name/$instance/current/bin ]
+  then
+    (
+      cd $name/$instance/current
+      find bin -type f | xargs chmod +x
+    )
+  fi
 
   if [ -r $BASEDIR/.app/var/list ]
   then
-- 
cgit v1.2.3