Archives
/
NanoDroid
mirror of https://gitlab.com/Nanolx/NanoDroid
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Banner printing and version bumping now less shitty

Browse Source
merge-requests/23/head
Christopher Roy Bratusek 5 years ago
parent 5543cd3c42
commit 993aa1731f
11 changed files with 89 additions and 80 deletions
Show Stats Download Patch File Download Diff File

34
CommonAddon
Unescape Escape View File

@ -16,6 +16,8 @@ source /tmp/backuptool.functions
MODID=@MODID@
OUTFD=
VERSION=21.0.90.99999999
print_google_apps()
{
cat <<EOF
@ -74,6 +76,20 @@ get_config () {
done
}
is_mounted() {
if [ ! -z "$2" ]; then
cat /proc/mounts | grep $1 | grep $2, >/dev/null
else
cat /proc/mounts | grep $1 >/dev/null
fi
return $?
}
if (is_mounted /data); then
mount -orw,remount /data >/dev/null
else mount -orw /data >/dev/null
fi
if [ ! -d /system/xbin ]; then
NANODROID_BINDIR=/system/bin
else NANODROID_BINDIR=/system/xbin
@ -153,7 +169,7 @@ backup_action () {
mount /data
ui_print " ++ ${MODID} addon.d: backup"
ui_print " ++ ${MODID} ${VERSION} addon.d: backup"
cat ${NANODROID_LIST} | while read FILE; do
echo " + backup: ${FILE}"
backup_file "${FILE}"
@ -166,18 +182,18 @@ backup_action () {
echo CUSTOM_FONT=${CUSTOM_FONT} > /tmp/nanodroid_font
fi
ui_print " ++ ${MODID} addon.d: backup done"
ui_print " ++ ${MODID} ${VERSION} addon.d: backup done"
}
restore_action () {
sleep 5
ui_print " ++ ${MODID} addon.d: restore"
ui_print " ++ ${MODID} ${VERSION} addon.d: restore"
cat ${NANODROID_LIST} | while read FILE; do
echo " + restore: ${FILE}"
restore_file "${FILE}"
done
ui_print " ++ ${MODID} addon.d: restore done"
ui_print " ++ ${MODID} ${VERSION} addon.d: restore done"
}
postrestore_action () {
@ -187,13 +203,13 @@ postrestore_action () {
if [ -f /tmp/nanodroid_font ]; then
source /tmp/nanodroid_font
ui_print " ++ ${MODID} addon.d: restoring NanoDroid-Font (${CUSTOM_FONT})"
ui_print " ++ ${MODID} ${VERSION} addon.d: restoring NanoDroid-Font (${CUSTOM_FONT})"
${NANODROID_BINDIR}/nanodroid-font -s "${CUSTOM_FONT}"
rm /tmp/nanodroid_font
fi
ui_print " ++ ${MODID} addon.d: GApps removal"
ui_print " ++ ${MODID} ${VERSION} addon.d: GApps removal"
print_google_apps | while read app; do
${NANODROID_BINDIR}/nanodroid-overlay --add ${app}
done
@ -204,16 +220,16 @@ postrestore_action () {
rm -rf /data/user_de/*/${app}
rm -rf /data/app/${app}-*
done
ui_print " ++ ${MODID} addon.d: GApps removal done"
ui_print " ++ ${MODID} ${VERSION} addon.d: GApps removal done"
get_config setup
if [ "${config_exists}" -eq 1 ]; then
source "${config}"
if [ "${nanodroid_overlay}" -eq 1 ]; then
ui_print " ++ ${MODID} addon.d: creating Overlays"
ui_print " ++ ${MODID} ${VERSION} addon.d: creating Overlays"
${NANODROID_BINDIR}/nanodroid-overlay --create
ui_print " ++ ${MODID} addon.d: creating Overlays done"
ui_print " ++ ${MODID} ${VERSION} addon.d: creating Overlays done"
fi
fi

15
CommonInstaller
Unescape Escape View File

@ -185,25 +185,25 @@ detect_outfd () {
show_banner () {
ui_print " "
ui_print "*****************************"
ui_print " NanoDroid ${VERSION} "
ui_print " created by Nanolx "
ui_print " NanoDroid "
case ${MODID} in
NanoDroid )
ui_print " Full package "
ui_print " > Full package "
;;
NanoDroid_microG )
ui_print " microG package "
ui_print " > microG package "
;;
NanoDroid_FDroid )
ui_print " F-Droid package "
ui_print " > F-Droid package "
;;
NanoDroid_BromiteWebView )
ui_print " Bromite WebView package "
ui_print " > Bromite WebView package "
;;
NanoDroid_OsmAnd )
ui_print " OsmAnd package "
ui_print " > OsmAnd package "
;;
esac
ui_print " ${VERSION} "
ui_print "*****************************"
ui_print " "
}
@ -538,6 +538,7 @@ recovery_cleanup () {
##########################################################################################
magisk_install_setup () {
ui_print " "
ui_print "******************************"
ui_print "Powered by Magisk (@topjohnwu)"
ui_print "******************************"

20
data/build-package.common
Unescape Escape View File

@ -99,30 +99,22 @@ increase_version_number() {
else ver=${3}
fi
sed -e "s/^VERSION=.*/VERSION=${2}.${ver}/" -i "${CWD}/build-package"
sed -e "s/^VERSION=.*/VERSION=${2}.${ver}/" -i "${CWD}/CommonInstaller"
for file in "build-package" "CommonInstaller" \
"systest/SysTest" "patcher/CommonPatcher" \
"setup-wizard/nanodroid-setup" "ommonAddon" \
"uninstaller/META-INF/com/google/android/update-binary"; do
sed -e "s/^VERSION=.*/VERSION=${2}.${ver}/" -i "${CWD}/${file}"
done
for module in Full microG F-Droid BromiteWebView OsmAnd; do
sed -e "s/version=.*/version=v${2}.${ver}/" -i \
"${CWD}/${module}/module.prop"
done
sed -e "s/\" NanoDroid.*/\" NanoDroid ${2}.${ver} \"/" -i \
"${CWD}/patcher/META-INF/com/google/android/update-binary"
sed -e "s/\" NanoDroid.*/\" NanoDroid ${2}.${ver} \"/" -i \
"${CWD}/uninstaller/META-INF/com/google/android/update-binary"
sed -e "s/rom_version\",.*/rom_version\", \"${2}\")\;/" -i \
"${CWD}/setup-wizard/META-INF/com/google/android/aroma-config"
sed -e "s/rom_date\",.*/rom_date\", \"${ver}\")\;/" -i \
"${CWD}/setup-wizard/META-INF/com/google/android/aroma-config"
sed -e "s/Wizard.*/Wizard ${2}.${ver}\")\;/" -i \
"${CWD}/setup-wizard/META-INF/com/google/android/updater-script"
sed -e "s/\" NanoDroid.*/\" NanoDroid ${2}.${ver} \"/" -i \
"${CWD}/setup-wizard/nanodroid-setup"
sed -e "s/\" addon.d.*/\" addon.d ${2}.${ver} \"/" -i \
"${CWD}"/patcher/dexpatcher/70-nanodroidpatcher.sh
exit 0
}

17
patcher/CommonPatcher
Unescape Escape View File

@ -6,10 +6,23 @@
#
##########################################################################################
VERSION=21.0.90.99999999
##########################################################################################
# Generic Functions
##########################################################################################
show_banner () {
ui_print " "
ui_print "********************************"
ui_print " NanoDroid "
ui_print " Framework Patcher "
ui_print " Powered by DexPatcher "
ui_print " ${VERSION} "
ui_print "********************************"
ui_print " "
}
setup_environment () {
TMPDIR=/dev/tmp/install
@ -24,8 +37,8 @@ setup_environment () {
}
ui_print() {
echo -n -e "ui_print $1\n" >> /proc/self/fd/$OUTFD
echo -n -e "ui_print\n" >> /proc/self/fd/$OUTFD
${BOOTMODE} && echo "${1}" || \
echo -e "ui_print ${1}\nui_print" >> /proc/self/fd/${OUTFD}
}
is_mounted () {

9
patcher/META-INF/com/google/android/update-binary
Unescape Escape View File

@ -20,14 +20,7 @@ BASEDIR="${TMPDIR}/dexpatcher"
detect_outfd
ui_print " "
ui_print "********************************"
ui_print " NanoDroid 21.0.90.99999999 "
ui_print " created by @Nanolx "
ui_print " Framework Patcher "
ui_print "Powered by DexPatcher (@lanchon)"
ui_print "********************************"
ui_print " "
show_banner
mount_partitions

9
patcher/dexpatcher/70-nanodroidpatcher.sh
Unescape Escape View File

@ -28,14 +28,7 @@ export ANDROID_DATA=${BASEDIR}
NanoDroidPatcher () {
sleep 5
ui_print " "
ui_print "*******************************"
ui_print " NanoDroid Framework Patcher "
ui_print " addon.d 21.0.90.99999999 "
ui_print " created by @Nanolx "
ui_print " Utilizing DexPatcher @lanchon "
ui_print "*******************************"
ui_print " "
show_banner
mount_partitions

14
setup-wizard/META-INF/com/google/android/updater-script
Unescape Escape View File

@ -1,19 +1,5 @@
set_progress(0.0);
ui_print(" ");
ui_print("> NanoDroid Setup Wizard 21.0.90.99999999");
ui_print(" ");
set_progress(0.1);
ui_print("> Creating Configuration Files");
package_extract_file("nanodroid-setup", "/tmp/nanodroid-setup");
set_perm(0, 0, 0777, "/tmp/nanodroid-setup");
run_program("/tmp/nanodroid-setup");
ui_print(" ");
ui_print(">> Now flash the NanoDroid package of your choice!");
ui_print(" ");
ui_print("> Thanks for using NanoDroid");
ui_print(" ");
set_progress(1.0);

21
setup-wizard/nanodroid-setup
Unescape Escape View File

@ -2,6 +2,7 @@
OUTFD=2
CONF_BACKUP="/data/media/0/nanodroid_backups/config_$(date +%Y%m%d-%H.%M.%S)"
VERSION=21.0.90.99999999
ui_print() {
echo -n -e "ui_print $1\n" >> /proc/self/fd/$OUTFD
@ -53,12 +54,14 @@ gmscore_prop="${aromapath}/gmscore.prop"
ui_print " "
ui_print "****************************"
ui_print " NanoDroid 21.0.90.99999999 "
ui_print " created by @Nanolx "
ui_print " Setup Wizard "
ui_print " NanoDroid "
ui_print " Setup Wizard "
ui_print " ${VERSION} "
ui_print "****************************"
ui_print " "
ui_print " > Creating Configuration files"
if (is_mounted /data); then
mount -orw,remount /data >/dev/null
else mount -orw /data >/dev/null
@ -92,7 +95,7 @@ for setupfile in ${nanodroid_apps} ${nanodroid_overlay} ${nanodroid_setup}; do
done
ui_print " "
ui_print " < Installer Configuration"
ui_print " < Installer Configuration"
setup_add 1 nanodroid_fdroid
setup_add 2 nanodroid_apps
@ -173,7 +176,7 @@ elif grep -q "selected.1=2" "${gmscore_prop}"; then
fi
ui_print " "
ui_print " < Installed Applications"
ui_print " < Installed Applications"
apps_add 1 Alarmio
apps_add 2 Amaze
@ -204,7 +207,7 @@ apps_add 26 Twidere
apps_add 27 XDALabs
ui_print " "
ui_print " < Debloated Applications"
ui_print " < Debloated Applications"
overlay_add 1 BasicDreams
overlay_add 2 Browser
@ -236,3 +239,9 @@ overlay_add 27 ViaBrowser
overlay_add 28 Wallpaper
overlay_add 29 WallpaperBackup
overlay_add 30 WallpaperPickerGoogle
ui_print " "
ui_print " >> Now flash the NanoDroid package of your choice!"
ui_print " "
ui_print " > Thanks for using NanoDroid"
ui_print " "

7
systest/META-INF/com/google/android/update-binary
Unescape Escape View File

@ -16,12 +16,7 @@ fi
detect_bootmode
detect_outfd
ui_print " "
ui_print "******************************"
ui_print " NanoDroid SysTest "
ui_print " 20181118 "
ui_print "******************************"
ui_print " "
show_banner
ui_print " || performing tests"

10
systest/SysTest
Unescape Escape View File

@ -6,6 +6,7 @@
#
##########################################################################################
VERSION=21.0.90.99999999
TMPDIR=/dev/tmp
LOGFILE="/data/media/0/nanodroid_logs/NanoDroid-SysTest-$(date +%Y%m%d-%H.%M.%S).log"
@ -13,6 +14,15 @@ LOGFILE="/data/media/0/nanodroid_logs/NanoDroid-SysTest-$(date +%Y%m%d-%H.%M.%S)
# Generic Functions
##########################################################################################
show_banner () {
ui_print " "
ui_print "*******************"
ui_print " NanoDroid SysTest "
ui_print " ${VERSION} "
ui_print "*******************"
ui_print " "
}
ui_print() {
${BOOTMODE} && echo "${1}" || \
echo -e "ui_print ${1}\nui_print" >> /proc/self/fd/${OUTFD}

13
uninstaller/META-INF/com/google/android/update-binary
Unescape Escape View File

@ -2,7 +2,8 @@
OUTFD=$2
ZIP=$3
BACKUP_DIR="${BACKUP_DIR}"
BACKUP_DIR="/data/media/0/nanodroid_backups"
VERSION=21.0.90.99999999
detect_bootmode () {
[ -z ${BOOTMODE} ] && BOOTMODE=false
@ -303,11 +304,11 @@ patcher_uninstall () {
}
ui_print " "
ui_print "*****************************"
ui_print " NanoDroid 21.0.90.99999999 "
ui_print " created by Nanolx "
ui_print " Uninstaller "
ui_print "*****************************"
ui_print "**********************"
ui_print " NanoDroid "
ui_print " Uninstaller "
ui_print " ${VERSION} "
ui_print "**********************"
ui_print " "
detect_bootmode

Write Preview
Loading…
Cancel
Save