azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix handling symbolic links to '../*' in update_xcode.sh

Browse Source 
tar -s pattern was mistakenly applied to symlink targets too,
turning symlink target '../foo' into 'bar./foo'.
This commit is contained in:
Svyatoslav Scherbina
2020-04-03 10:41:23 +03:00
committed by SvyatoslavScherbina
parent 3a247952c3
commit 8e5271e578
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/scripts/update_xcode.sh
+3 -3
View File
@@ -21,7 +21,7 @@ for s in $SDKS; do
tarball_var=TARBALL_${s} tarball_var=TARBALL_${s}
tarball=${!tarball_var} tarball=${!tarball_var}
echo "Packing SDK $s as $OUT/$tarball.tar.gz..." echo "Packing SDK $s as $OUT/$tarball.tar.gz..."
$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $p -s '/^\./$tarball/' ." $SHELL -c "tar czf $OUT/$tarball.tar.gz -C $p -s '/^\./$tarball/HS' ."
done done
t=`xcrun -f ld` t=`xcrun -f ld`
@@ -29,11 +29,11 @@ t=`dirname $t`
t=`grealpath $t/../..` t=`grealpath $t/../..`
tarball=$TARBALL_xcode tarball=$TARBALL_xcode
echo "Packing toolchain $OUT/$tarball.tar.gz..." echo "Packing toolchain $OUT/$tarball.tar.gz..."
$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/' ." $SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/HS' ."
t=`xcrun -f bitcode-build-tool` t=`xcrun -f bitcode-build-tool`
t=`dirname $t` t=`dirname $t`
t=`grealpath $t/..` t=`grealpath $t/..`
tarball=$TARBALL_xcode_addon tarball=$TARBALL_xcode_addon
echo "Packing additional tools $OUT/$tarball.tar.gz..." echo "Packing additional tools $OUT/$tarball.tar.gz..."
$SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/' ." $SHELL -c "tar czf $OUT/$tarball.tar.gz -C $t -s '/^\./$tarball/HS' ."