Skip to content

Version 1.1.9 - Add support for DEBs with data.tar.gz #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bbond007 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Version 1.1.9 - Add support for DEBs with data.tar.gz #4

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions ini_settings.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
# You can download the latest version of this script from:
# https://github.com/MiSTer-devel/Scripts_MiSTer

# Version 1.1.9 - 2019-06-01 - Add support for DEBs with data.tar.gz.
# Version 1.1.8 - 2019-05-31 - Added DIALOG_HEIGHT parameter.
# Version 1.1.7 - 2019-05-30 - The menu box uses all available space now.
# Version 1.1.6 - 2019-05-29 - Speed optimizations.
Expand Down Expand Up @@ -374,14 +375,20 @@ function installDEBS () {
echo "Extracting ${ARCHIVE_FILES}"
ORIGINAL_DIR="$(pwd)"
cd "${TEMP_PATH}"
rm data.tar.xz > /dev/null 2>&1
ar -x "${TEMP_PATH}/${MAX_DEB_NAME}" data.tar.xz
rm data.tar.xz data.tar.gz > /dev/null 2>&1
ar -x "${TEMP_PATH}/${MAX_DEB_NAME}" data.tar.*
cd "${ORIGINAL_DIR}"
rm "${TEMP_PATH}/${MAX_DEB_NAME}"
mkdir -p "${DEST_DIR}"
[ ! -f "${TEMP_PATH}/data.tar.xz" ] && echo "Error: no ${TEMP_PATH}/data.tar.xz found." && exit 1
tar -xJf "${TEMP_PATH}/data.tar.xz" --wildcards --no-anchored --strip-components="${STRIP_COMPONENTS}" -C "${DEST_DIR}" "${ARCHIVE_FILES}"
rm "${TEMP_PATH}/data.tar.xz" > /dev/null 2>&1
if [ -f "${TEMP_PATH}/data.tar.xz" ]
then
tar -xJf "${TEMP_PATH}/data.tar.xz" --wildcards --no-anchored --strip-components="${STRIP_COMPONENTS}" -C "${DEST_DIR}" "${ARCHIVE_FILES}"
Copy link
Copy Markdown
Contributor

@frederic-mahe frederic-mahe Jun 4, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi, I am not sure you need to treat gz and xz differently there. tar can recognize the different compression and decide what decompression algorithm to use, sotar xf data.tar.* should work for both cases.

I would have to check if this is true for the tar version installed on the MiSTer though.

rm "${TEMP_PATH}/data.tar.xz" > /dev/null 2>&1
else
[ ! -f "${TEMP_PATH}/data.tar.gz" ] && echo "Error: no ${TEMP_PATH}/data.tar found." && exit 1
tar -xzf "${TEMP_PATH}/data.tar.gz" --wildcards --no-anchored --strip-components="${STRIP_COMPONENTS}" -C "${DEST_DIR}" "${ARCHIVE_FILES}"
rm "${TEMP_PATH}/data.tar.gz" > /dev/null 2>&1
fi
fi
done
}
Expand Down