From e194c3ce287a787c6af27a62e369be40d60f3318 Mon Sep 17 00:00:00 2001 From: James Larrowe Date: Tue, 18 Dec 2018 17:23:20 -0500 Subject: [PATCH] Fix CREW_DEST_HOME constant (#2957) --- crew | 4 ++-- install.sh | 4 ++-- lib/const.rb | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/crew b/crew index cf947aa1b..63947f0d1 100755 --- a/crew +++ b/crew @@ -584,9 +584,9 @@ 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/* | (cd /; tar xp --keep-directory-symlink -f -)" + system "tar cvf - ./usr ./home | (cd /; tar xp --keep-directory-symlink -f -)" else - system "tar cf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -)" + system "tar cf - ./usr ./home | (cd /; tar xp --keep-directory-symlink -f -)" end end end diff --git a/install.sh b/install.sh index 2466e921f..c8355c5ec 100755 --- a/install.sh +++ b/install.sh @@ -108,10 +108,10 @@ function extract_install () { #extract and install echo "Extracting $1 (this may take a while)..." - rm -rf ./usr + rm -rf ./usr ./home tar -xf $2 echo "Installing $1 (this may take a while)..." - tar cf - ./usr/* | (cd /; tar xp --keep-directory-symlink -f -) + tar cf - ./usr ./home | (cd /; tar xp --keep-directory-symlink -f -) mv ./dlist $CREW_CONFIG_PATH/meta/$1.directorylist mv ./filelist $CREW_CONFIG_PATH/meta/$1.filelist } diff --git a/lib/const.rb b/lib/const.rb index b602bf44e..99d1523b2 100644 --- a/lib/const.rb +++ b/lib/const.rb @@ -1,6 +1,6 @@ # Defines common constants used in different parts of crew -CREW_VERSION = '1.0.4' +CREW_VERSION = '1.0.5' ARCH = `uname -m`.strip ARCH_LIB = if ARCH == 'x86_64' then 'lib64' else 'lib' end