live-bootstrap

commit: 74f7ec4cd334bfdeb8e0fe260ddc1d379d4769d2
parent 8504c35685bc59a46ea60871faf30c9b3e8b465f
Author: fosslinux <fosslinux@aussies.space>
Date:   Sun, 16 May 2021 12:06:11 +1000

Merge pull request #116 from stikonas/tar_ownership

Unpack tarballs with --no-same-owner.
Diffstat:
M
sysa/helpers.sh
39
+++++++++++++++++++++++----------------

1 file changed, 23 insertions(+), 16 deletions(-)
diff --git a/sysa/helpers.sh b/sysa/helpers.sh
@@ -76,22 +76,29 @@ build () {
 default_src_unpack() {
     src_dir="${base_dir}/src"
 
-    for i in "${src_dir}"/*.tar.gz; do
-        [ -e "${i}" ] || continue
-        tar -xzf "${i}"
-    done
-    for i in "${src_dir}"/*.tar.bz2; do
-        [ -e "${i}" ] || continue
-        tar -xf "${i}" --use-compress-program=bzip2
-    done
-    for i in "${src_dir}"/*.tar.xz; do
-        [ -e "${i}" ] || continue
-        tar -xf "${i}" --use-compress-program=xz
-    done
-    for i in "${src_dir}"/*.tar; do
-        [ -e "${i}" ] || continue
-        tar -xf "${i}"
-    done
+    # Check for new tar
+    if test -e "${PREFIX}/libexec/rmt"; then
+        for i in "${src_dir}"/*; do
+            tar --no-same-owner -xf "${i}"
+        done
+    else
+        for i in "${src_dir}"/*.tar.gz; do
+            [ -e "${i}" ] || continue
+            tar -xzf "${i}"
+        done
+        for i in "${src_dir}"/*.tar.bz2; do
+            [ -e "${i}" ] || continue
+            tar -xf "${i}" --use-compress-program=bzip2
+        done
+        for i in "${src_dir}"/*.tar.xz; do
+            [ -e "${i}" ] || continue
+            tar -xf "${i}" --use-compress-program=xz
+        done
+        for i in "${src_dir}"/*.tar; do
+            [ -e "${i}" ] || continue
+            tar -xf "${i}"
+        done
+    fi
 }
 
 # Default function to prepare source code.