bryan/installJRMC
1
0
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Fix compat with legacy ar

Browse Source
This commit is contained in:
Bryan Roessler
2022-01-13 12:48:19 -05:00
parent 0c0dbbe5f4
commit fe0e467e9f
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
installJRMC
View File

@@ -1435,18 +1435,19 @@ main() {
acquireDeb acquireDeb
if (( COMPAT_SWITCH )); then if (( COMPAT_SWITCH )); then
declare extract_dir && extract_dir="$(mktemp -d)" declare extract_dir && extract_dir="$(mktemp -d)"
ar x --output "$extract_dir" "$MCDEB" declare mcdeb_compat="$MCDEB.compat"
tar -xJf "$extract_dir/control.tar.xz" -C "$extract_dir" pushd "$extract_dir" &>/dev/null || return $?
ar x "$MCDEB"
tar -xJf "control.tar.xz"
# Remove minimum version specifiers from control file # Remove minimum version specifiers from control file
sed -i 's/ ([^)]*)//g' "$extract_dir/control" sed -i 's/ ([^)]*)//g' "control"
sed -i 's/([^)]*)//g' "$extract_dir/control" # MC DEB package error sed -i 's/([^)]*)//g' "control" # TODO email bob, MC DEB package error
tar -cJf "$extract_dir/control.tar.xz" \ tar -cJf "control.tar.xz" "control" "postinst"
-C "$extract_dir" "control" "postinst" ar rcs "$mcdeb_compat" "debian-binary" "control.tar.xz" "data.tar.xz"
declare mcdeb="$MCDEB.compat" popd || return $?
ar rcs "$mcdeb" "$extract_dir/debian-binary" "$extract_dir/control.tar.xz" "$extract_dir/data.tar.xz"
rm -rf "$extract_dir" rm -rf "$extract_dir"
fi fi
pkg_install_cmd="installPackage --skip-check-installed --nogpgcheck ${mcdeb:-$MCDEB}" pkg_install_cmd="installPackage --skip-check-installed --nogpgcheck $mcdeb_compat"
debug "$pkg_install_cmd" || pkg_install_cmd+=" &>/dev/null" debug "$pkg_install_cmd" || pkg_install_cmd+=" &>/dev/null"
eval "$pkg_install_cmd" eval "$pkg_install_cmd"
fi fi