Skip to content

Commit 5996900

Browse files
Change Rat Package Packaging to (tar.xz)
1 parent 04108e3 commit 5996900

File tree

3 files changed

+4
-6
lines changed

3 files changed

+4
-6
lines changed

build-all.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ installBuiltPackage()
396396
echo "-- Installing '$(basename $package .rat)'"
397397
mkdir -p $APP_ROOT_DIR/packages
398398

399-
unzip -o "$package" -d "$APP_ROOT_DIR" &> /dev/zero
399+
tar -xf "$package" -C "$APP_ROOT_DIR"
400400

401401
touch $APP_ROOT_DIR/makeSymlinks.sh
402402
bash $APP_ROOT_DIR/makeSymlinks.sh

create-rootfs-rat.sh

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ for i in $ROOTFS_PKGS; do
6969
if [ -n "$resolvedPath" ] && [ ! -f "$INIT_DIR/built-pkgs/$(basename $i | sed "s/.rat/.isOptional/g")" ]; then
7070
echo "Extracting '$(basename $resolvedPath)'..."
7171

72-
7z -aoa e "$resolvedPath" pkg-header &> /dev/zero
72+
tar -xf "$resolvedPath" pkg-header
7373

7474
packageCategory=$(getElementFromHeader 2)
7575

@@ -82,7 +82,7 @@ for i in $ROOTFS_PKGS; do
8282
elif [ "$packageCategory" == "AdrenoTools" ]; then
8383
cp -f "$resolvedPath" "adrenoTools"
8484
else
85-
7z -aoa x "$resolvedPath" &> /dev/zero
85+
tar -xf "$resolvedPath"
8686
fi
8787

8888
if [ -f "makeSymlinks.sh" ]; then
@@ -94,8 +94,6 @@ done
9494

9595
mv new_makeSymlinks.sh makeSymlinks.sh
9696

97-
echo -e "$PWD:\n$(ls --color)"
98-
9997
$INIT_DIR/tools/create-rat-pkg.sh "MiceWine-RootFS" "MiceWine RootFS" "" "$ARCH" "($GIT_SHORT_SHA)" "rootfs" "$PWD" "$INIT_DIR"
10098

10199
cd "$INIT_DIR"

tools/create-rat-pkg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ echo "vkDriverLib=$PACKAGE_VK_DRIVER_LIB" >> pkg-header
6666

6767
symlinkToSh "files/"
6868

69-
7z -tzip -mx=5 a "$OUTDIR/$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_ARCHITECTURE.rat" &> /dev/zero
69+
tar -cJf "$OUTDIR/$PACKAGE_NAME-$PACKAGE_VERSION-$PACKAGE_ARCHITECTURE.rat" pkg-header $(ls | grep -v pkg-header)

0 commit comments

Comments
 (0)