mirror of
https://gitlab.com/Nanolx/NanoDroid
synced 2024-11-09 19:10:30 +00:00
build-package: use gzip instead of bzip2 (faster and same compression result)
This commit is contained in:
Christopher Roy Bratusek
parent
0fe718d6dc
commit
fb9e83c5d9
@ -1311,11 +1311,11 @@ nanodroid_install_apk () {
|
||||
echo " installing app: ${app}"
|
||||
echo " from: ${source}"
|
||||
echo " into: ${dest} [${dest_apk}]"
|
||||
cp "${source}.bz2" "${dest}/${dest_apk}.bz2" || \
|
||||
cp "${source}.gz" "${dest}/${dest_apk}.gz" || \
|
||||
error "failed to install ${source} to ${dest}"
|
||||
|
||||
bzip2 -d "${dest}/${dest_apk}.bz2" || \
|
||||
error "failed to decompress ${dest}/${dest_apk}.bz2"
|
||||
gzip -d "${dest}/${dest_apk}.gz" || \
|
||||
error "failed to decompress ${dest}/${dest_apk}.gz"
|
||||
|
||||
installinfo_add "${dest}/${dest_apk}"
|
||||
|
||||
|
||||
@ -95,24 +95,24 @@ bm_WEBVIEW_x86=(bromite com.android.webview app BromiteWebView_x86 x86)
|
||||
# Files Database (for consistency check)
|
||||
###
|
||||
|
||||
files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/gsync/K/app/GoogleContactsSync/GoogleContactsSync.apk.bz2
|
||||
Full/gsync/K/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.bz2
|
||||
Full/gsync/L/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/gsync/L/app/GoogleContactsSync/GoogleContactsSync.apk.bz2
|
||||
Full/gsync/L/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.bz2
|
||||
Full/gsync/M/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/gsync/M/app/GoogleContactsSync/GoogleContactsSync.apk.bz2
|
||||
Full/gsync/M/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.bz2
|
||||
Full/gsync/N/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/gsync/N/app/GoogleContactsSync/GoogleContactsSync.apk.bz2
|
||||
Full/gsync/N/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.bz2
|
||||
Full/gsync/O/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/gsync/O/app/GoogleContactsSync/GoogleContactsSync.apk.bz2
|
||||
Full/gsync/O/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.bz2
|
||||
Full/gsync/P/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/gsync/P/app/GoogleContactsSync/GoogleContactsSync.apk.bz2
|
||||
Full/gsync/P/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.bz2
|
||||
files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
|
||||
Full/gsync/K/app/GoogleContactsSync/GoogleContactsSync.apk.gz
|
||||
Full/gsync/K/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
|
||||
Full/gsync/L/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
|
||||
Full/gsync/L/app/GoogleContactsSync/GoogleContactsSync.apk.gz
|
||||
Full/gsync/L/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
|
||||
Full/gsync/M/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
|
||||
Full/gsync/M/app/GoogleContactsSync/GoogleContactsSync.apk.gz
|
||||
Full/gsync/M/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
|
||||
Full/gsync/N/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
|
||||
Full/gsync/N/app/GoogleContactsSync/GoogleContactsSync.apk.gz
|
||||
Full/gsync/N/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
|
||||
Full/gsync/O/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
|
||||
Full/gsync/O/app/GoogleContactsSync/GoogleContactsSync.apk.gz
|
||||
Full/gsync/O/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
|
||||
Full/gsync/P/app/GoogleCalendarSync/GoogleCalendarSync.apk.gz
|
||||
Full/gsync/P/app/GoogleContactsSync/GoogleContactsSync.apk.gz
|
||||
Full/gsync/P/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk.gz
|
||||
Full/swipe/arm/libjni_keyboarddecoder.so
|
||||
Full/swipe/arm/libjni_latinimegoogle.so_19
|
||||
Full/swipe/arm/libjni_latinimegoogle.so_21
|
||||
@ -130,49 +130,49 @@ files_database=( Full/gsync/K/app/GoogleCalendarSync/GoogleCalendarSync.apk.bz2
|
||||
Full/swipe/x86/libjni_latinimegoogle.so
|
||||
Full/swipe/x86_64/libjni_keyboarddecoder.so
|
||||
Full/swipe/x86_64/libjni_latinimegoogle.so
|
||||
Full/system/app/Alarmio/Alarmio.apk.bz2
|
||||
Full/system/app/Amaze/Amaze.apk.bz2
|
||||
Full/system/app/AnysoftKeyboard/AnysoftKeyboard.apk.bz2
|
||||
Full/system/app/AuroraStore/AuroraStore.apk.bz2
|
||||
Full/system/app/Blokada/Blokada.apk.bz2
|
||||
Full/system/app/FDroid/FDroid.apk.bz2
|
||||
Full/system/app/FaceSlim/FaceSlim.apk.bz2
|
||||
Full/system/app/HackersKeyboard/HackersKeyboard.apk.bz2
|
||||
Full/system/app/K9Mail/K9Mail.apk.bz2
|
||||
Full/system/app/KeePassDX/KeePassDX.apk.bz2
|
||||
Full/system/app/KernelAdiutor/KernelAdiutor.apk.bz2
|
||||
Full/system/app/MPV/MPV.apk.bz2
|
||||
Full/system/app/NewPipe/NewPipe.apk.bz2
|
||||
Full/system/app/Oandbackup/Oandbackup.apk.bz2
|
||||
Full/system/app/Odyssey/Odyssey.apk.bz2
|
||||
Full/system/app/OpenCamera/OpenCamera.apk.bz2
|
||||
Full/system/app/OpenKeyChain/OpenKeyChain.apk.bz2
|
||||
Full/system/app/OpenLauncher/OpenLauncher.apk.bz2
|
||||
Full/system/app/OpenVPN/OpenVPN.apk.bz2
|
||||
Full/system/app/Orbot/Orbot.apk.bz2
|
||||
Full/system/app/PrivacyBrowser/PrivacyBrowser.apk.bz2
|
||||
Full/system/app/QKSMS/QKSMS.apk.bz2
|
||||
Full/system/app/SimpleCalendar/SimpleCalendar.apk.bz2
|
||||
Full/system/app/SimpleGallery/SimpleGallery.apk.bz2
|
||||
Full/system/app/Substratum/Substratum.apk.bz2
|
||||
Full/system/app/Termux/Termux.apk.bz2
|
||||
Full/system/app/TorBrowser/TorBrowser.apk.bz2
|
||||
Full/system/app/Twidere/Twidere.apk.bz2
|
||||
Full/system/app/XDALabs/XDALabs.apk.bz2
|
||||
Full/system/app/nlpBackendApple/nlpBackendApple.apk.bz2
|
||||
Full/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk.bz2
|
||||
Full/system/app/nlpBackendDejavu/nlpBackendDejavu.apk.bz2
|
||||
Full/system/app/nlpBackendRadiocell/nlpBackendRadiocell.apk.bz2
|
||||
Full/system/app/nlpBackendNominatim/nlpBackendNominatim.apk.bz2
|
||||
Full/system/app/DroidGuard/DroidGuard.apk.bz2
|
||||
Full/system/priv-app/FDroidPrivileged/FDroidPrivileged.apk.bz2
|
||||
Full/system/priv-app/FakeStore/FakeStore.apk.bz2
|
||||
Full/system/priv-app/Phonesky/Phonesky.apk.bz2
|
||||
Full/system/priv-app/YalpStore/YalpStore.apk.bz2
|
||||
Full/system/priv-app/GsfProxy/GsfProxy.apk.bz2
|
||||
Full/system/priv-app/GmsCore/GmsCore.apk.bz2
|
||||
BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk.bz2
|
||||
BromiteWebView/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk.bz2
|
||||
BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk.bz2
|
||||
OsmAnd/system/app/OsmAnd/OsmAnd.apk.bz2
|
||||
OsmAnd/system/app/OsmAnd_ContourLines/OsmAnd_ContourLines.apk.bz2 )
|
||||
Full/system/app/Alarmio/Alarmio.apk.gz
|
||||
Full/system/app/Amaze/Amaze.apk.gz
|
||||
Full/system/app/AnysoftKeyboard/AnysoftKeyboard.apk.gz
|
||||
Full/system/app/AuroraStore/AuroraStore.apk.gz
|
||||
Full/system/app/Blokada/Blokada.apk.gz
|
||||
Full/system/app/FDroid/FDroid.apk.gz
|
||||
Full/system/app/FaceSlim/FaceSlim.apk.gz
|
||||
Full/system/app/HackersKeyboard/HackersKeyboard.apk.gz
|
||||
Full/system/app/K9Mail/K9Mail.apk.gz
|
||||
Full/system/app/KeePassDX/KeePassDX.apk.gz
|
||||
Full/system/app/KernelAdiutor/KernelAdiutor.apk.gz
|
||||
Full/system/app/MPV/MPV.apk.gz
|
||||
Full/system/app/NewPipe/NewPipe.apk.gz
|
||||
Full/system/app/Oandbackup/Oandbackup.apk.gz
|
||||
Full/system/app/Odyssey/Odyssey.apk.gz
|
||||
Full/system/app/OpenCamera/OpenCamera.apk.gz
|
||||
Full/system/app/OpenKeyChain/OpenKeyChain.apk.gz
|
||||
Full/system/app/OpenLauncher/OpenLauncher.apk.gz
|
||||
Full/system/app/OpenVPN/OpenVPN.apk.gz
|
||||
Full/system/app/Orbot/Orbot.apk.gz
|
||||
Full/system/app/PrivacyBrowser/PrivacyBrowser.apk.gz
|
||||
Full/system/app/QKSMS/QKSMS.apk.gz
|
||||
Full/system/app/SimpleCalendar/SimpleCalendar.apk.gz
|
||||
Full/system/app/SimpleGallery/SimpleGallery.apk.gz
|
||||
Full/system/app/Substratum/Substratum.apk.gz
|
||||
Full/system/app/Termux/Termux.apk.gz
|
||||
Full/system/app/TorBrowser/TorBrowser.apk.gz
|
||||
Full/system/app/Twidere/Twidere.apk.gz
|
||||
Full/system/app/XDALabs/XDALabs.apk.gz
|
||||
Full/system/app/nlpBackendApple/nlpBackendApple.apk.gz
|
||||
Full/system/app/nlpBackendIchnaea/nlpBackendIchnaea.apk.gz
|
||||
Full/system/app/nlpBackendDejavu/nlpBackendDejavu.apk.gz
|
||||
Full/system/app/nlpBackendRadiocell/nlpBackendRadiocell.apk.gz
|
||||
Full/system/app/nlpBackendNominatim/nlpBackendNominatim.apk.gz
|
||||
Full/system/app/DroidGuard/DroidGuard.apk.gz
|
||||
Full/system/priv-app/FDroidPrivileged/FDroidPrivileged.apk.gz
|
||||
Full/system/priv-app/FakeStore/FakeStore.apk.gz
|
||||
Full/system/priv-app/Phonesky/Phonesky.apk.gz
|
||||
Full/system/priv-app/YalpStore/YalpStore.apk.gz
|
||||
Full/system/priv-app/GsfProxy/GsfProxy.apk.gz
|
||||
Full/system/priv-app/GmsCore/GmsCore.apk.gz
|
||||
BromiteWebView/system/app/BromiteWebView_arm/BromiteWebView_arm.apk.gz
|
||||
BromiteWebView/system/app/BromiteWebView_arm64/BromiteWebView_arm64.apk.gz
|
||||
BromiteWebView/system/app/BromiteWebView_x86/BromiteWebView_x86.apk.gz
|
||||
OsmAnd/system/app/OsmAnd/OsmAnd.apk.gz
|
||||
OsmAnd/system/app/OsmAnd_ContourLines/OsmAnd_ContourLines.apk.gz )
|
||||
|
||||
@ -11,7 +11,7 @@ REPO_NANOLX="https://nanolx.org/fdroid/repo"
|
||||
REPO_BROMITE="https://fdroid.bromite.org/fdroid/repo"
|
||||
|
||||
# check dependencies
|
||||
for dep in gawk wget curl sha256sum jq bzip2; do
|
||||
for dep in gawk wget curl sha256sum jq gzip; do
|
||||
if ! which ${dep} &>/dev/null; then
|
||||
echo "${dep} is not installed!"
|
||||
exit 1
|
||||
@ -35,8 +35,8 @@ check_sha256sum () {
|
||||
EX_CHECKSUM="${2}"
|
||||
|
||||
case ${INPUT} in
|
||||
*.bz2 )
|
||||
IN_CHECKSUM=$(bzip2 -dc ${INPUT} 2>/dev/null | sha256sum | gawk '{print $1}')
|
||||
*.gz )
|
||||
IN_CHECKSUM=$(gzip -dc ${INPUT} 2>/dev/null | sha256sum | gawk '{print $1}')
|
||||
;;
|
||||
|
||||
* )
|
||||
@ -143,15 +143,15 @@ grab_apk_from_repo () {
|
||||
|
||||
APK_URL="${REPO}/${APK_NAME}"
|
||||
|
||||
if check_sha256sum "${APK_DEST}/${4}.apk.bz2" "${SHA_SUM}"; then
|
||||
if check_sha256sum "${APK_DEST}/${4}.apk.gz" "${SHA_SUM}"; then
|
||||
echo -e "\nUp-to-Date from ${REPO_P} : ${4}.apk"
|
||||
else echo -e "\nUpdating from ${REPO_P} : ${4}.apk"
|
||||
rm -f "${APK_DEST}/${4}.apk.bz2"
|
||||
rm -f "${APK_DEST}/${4}.apk.gz"
|
||||
wget -q -O "${APK_DEST}/${4}.apk" "${APK_URL}"
|
||||
|
||||
if check_sha256sum "${APK_DEST}/${4}.apk" "${SHA_SUM}"; then
|
||||
echo " SHA256 hash of ${4}.apk is correct"
|
||||
bzip2 -z "${APK_DEST}/${4}.apk"
|
||||
gzip "${APK_DEST}/${4}.apk"
|
||||
else echo -e " SHA256 hash of ${4}.apk is wrong!\
|
||||
\n expected : ${SHA_SUM}\
|
||||
\n got : ${IN_CHECKSUM}"
|
||||
@ -201,15 +201,15 @@ ${5}-${VERSION}-android-apk-download"
|
||||
APK_URL="https://www.apkmirror.com${URL_WP}"
|
||||
APK_DEST="${CWD}/Full/system/${3}/${4}"
|
||||
|
||||
if check_sha256sum "${APK_DEST}/${4}.apk.bz2" "${SHA_SUM}"; then
|
||||
if check_sha256sum "${APK_DEST}/${4}.apk.gz" "${SHA_SUM}"; then
|
||||
echo -e "\nUp-to-Date from APK Mirror : ${4}.apk"
|
||||
else echo -e "\nUpdating from APK Mirror : ${4}.apk"
|
||||
rm -f "${APK_DEST}/${4}.apk.bz2"
|
||||
rm -f "${APK_DEST}/${4}.apk.gz"
|
||||
wget --user-agent="${USER_AGENT}" -q "${APK_URL}" -O "${APK_DEST}/${4}.apk"
|
||||
|
||||
if check_sha256sum "${APK_DEST}/${4}.apk" "${SHA_SUM}"; then
|
||||
echo " SHA256 hash of ${4}.apk is correct"
|
||||
bzip2 -z "${APK_DEST}/${4}.apk"
|
||||
gzip "${APK_DEST}/${4}.apk"
|
||||
else echo -e " SHA256 hash of ${4}.apk is wrong!\
|
||||
\n expected : ${SHA_SUM}\
|
||||
\n got : ${IN_CHECKSUM}"
|
||||
@ -260,9 +260,9 @@ grab_apk_from_ogapps () {
|
||||
|
||||
APK_DEST="${CWD}/Full/gsync/${API_LETTER}/${2}/${3}"
|
||||
|
||||
if [[ -f "${APK_DEST}/${3}.apk.bz2" ]]; then
|
||||
if [[ -f "${APK_DEST}/${3}.apk.gz" ]]; then
|
||||
echo -e "\nUpdating from OpenGApps : ${3}.apk [${API_LETTER}]"
|
||||
rm -f "${APK_DEST}/${3}.apk.bz2"
|
||||
rm -f "${APK_DEST}/${3}.apk.gz"
|
||||
else echo -e "\nDownloading from OpenGApps: ${3}.apk [${API_LETTER}]"
|
||||
mkdir -p "${APK_DEST}"
|
||||
fi
|
||||
@ -272,7 +272,7 @@ grab_apk_from_ogapps () {
|
||||
wget -q -O "${APK_DEST}/${3}.apk" "${APK_URL}" || \
|
||||
rm -f "${APK_DEST}/${3}.apk"
|
||||
|
||||
[ -f "${APK_DEST}/${3}.apk" ] && bzip2 -z "${APK_DEST}/${3}.apk"
|
||||
[ -f "${APK_DEST}/${3}.apk" ] && gzip "${APK_DEST}/${3}.apk"
|
||||
}
|
||||
|
||||
grab_lib_from_ogapps () {
|
||||
|
||||
Binary file not shown.
Loading…
Reference in New Issue
Block a user