Merge pull request #2961 from uberhacker/fix-crew-install.sh

Fix crew and install.sh

crew

@@ -584,9 +584,17 @@ def install_package (pkgdir)
     strip_find_files "find . -type f ! -iname '*\.bz2' ! -iname '*\.gz' ! -iname '*\.lha' ! -iname '*\.lz' ! -iname '*\.rar' ! -iname '*\.tar' ! -iname '*\.tgz' ! -iname '*\.xz' ! -iname '*\.zip' -perm /111 -print | sed -e '/lib.*\.a$/d' -e '/lib.*\.so/d'"
 
     if @opt_verbose then
-      system "tar cvf - ./usr ./home | (cd /; tar xp --keep-directory-symlink -f -)"
+      if [ -d "#{pkgdir}/home" ]; then
+        system "tar cvf - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)"
+      else
+        system "tar cvf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)"
+      fi
     else
-      system "tar cf - ./usr ./home | (cd /; tar xp --keep-directory-symlink -f -)"
+      if [ -d "#{pkgdir}/home" ]; then
+        system "tar cf - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)"
+      else
+        system "tar cf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)"
+      fi
     end
   end
 end

install.sh

@@ -111,7 +111,11 @@ function extract_install () {
     rm -rf ./usr ./home
     tar -xf $2
     echo "Installing $1 (this may take a while)..."
-    tar cf - ./usr ./home | (cd /; tar xp --keep-directory-symlink -f -)
+    if [ -d "${CREW_BREW_DIR}/home" ]; then
+      tar cf - ./usr/* ./home/* | (cd /; tar xp --keep-directory-symlink -f -)
+    else
+      tar cf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)
+    fi
     mv ./dlist $CREW_CONFIG_PATH/meta/$1.directorylist
     mv ./filelist $CREW_CONFIG_PATH/meta/$1.filelist
 }