no longer ship Zelda ringtones

ChangeLog.md

@@ -30,6 +30,7 @@
      * colrm
      * look
      * setterm
+  * no longer ship Zelda ringtones
 
 * Patcher
   * for SDK 19 - 25 use dexpatcher 1.6.3

CommonInstaller

@@ -1102,19 +1102,6 @@ install_store () {
 	fi
 }
 
-install_zelda () {
-	# install Zelda Ringtones when requested
-	if [ "${nanodroid_zelda}" -eq 1 ]; then
-		ui_print " << with Zelda sounds"
-		if [ -d /system/media/audio ]; then
-			nanodroid_install_dir media
-		elif [ -d /system/product/media/audio ]; then
-			nanodroid_install_dir media /system/product/media
-		fi
-	else	ui_print " << without Zelda sounds"
-	fi
-}
-
 install_bash () {
 	if [ "${nanodroid_bash}" -eq 1 ]; then
 		ui_print " << with GNU Bash Shell"
@@ -1669,7 +1656,6 @@ check_cfg_setup () {
 	else	[ -z "${nanodroid_overlay}" ] && set_prop nanodroid_overlay 0
 	fi
 
-	[ -z "${nanodroid_zelda}" ] && set_prop nanodroid_zelda 1
 	[ -z "${nanodroid_mapsv1}" ] && set_prop nanodroid_mapsv1 1
 	[ -z "${nanodroid_init}" ] && set_prop nanodroid_init 1
 	[ -z "${nanodroid_gsync}" ] && set_prop nanodroid_gsync 0
@@ -1712,6 +1698,9 @@ check_cfg_setup () {
 	# in NanoDroid 22.5.2 nanodroid_nano was dropped
 	sed -e '/nanodroid_nano/d' -i "${cfg_setup}"
 
+	# in NanoDroid 22.5.2 nanodroid_zelda was dropped
+	sed -e '/nanodroid_zelda/d' -i "${cfg_setup}"
+
 	source "${cfg_setup}"
 }
 

Full/META-INF/com/google/android/update-binary

@@ -50,7 +50,6 @@ set_progress 0.5
 install_apps
 set_progress 0.75
 
-install_zelda
 install_initd
 install_swipe
 install_bash

SetupWizard/META-INF/com/google/android/aroma-config

@@ -50,14 +50,12 @@ checkbox(
 	"Adjust the basic settings", "", 2, #-- Group 1
 	"Apps",		"Install Apps (customized later)",			1,
 	"Overlay",	"Debloat Apps (customized later)",			1,
-	"Zelda Tunes",	"Install The Legend of Zelda rintones and sounds",	1,
 	"Maps API v1",	"Install Google Maps API version 1",			1,
 	"Init Scripts",	"Install init scripts",					1,
 	"Google Sync",	"Install Google Contacts & Calendar Sync",		0,
 	"Swipe",	"Install Swipe libraries",				0,
 	"Force System",	"Force System Mode Installation",			0,
 	"GNU Bash",	"Install GNU Bash Shell",				1,
-	"GNU Nano",	"Install GNU Nano Terminal Editor",			1,
 	"Shell Utils",	"Install Shell Utils from bsdmainutils and util-linux",	1
 );
 

SetupWizard/nanodroid-setup

@@ -102,15 +102,13 @@ ui_print " < Installer Configuration"
 
 setup_add 1 nanodroid_apps
 setup_add 2 nanodroid_overlay
-setup_add 3 nanodroid_zelda
+setup_add 3 nanodroid_mapsv1
-setup_add 4 nanodroid_mapsv1
+setup_add 4 nanodroid_init
-setup_add 5 nanodroid_init
+setup_add 5 nanodroid_gsync
-setup_add 6 nanodroid_gsync
+setup_add 6 nanodroid_swipe
-setup_add 7 nanodroid_swipe
+setup_add 7 nanodroid_forcesystem
-setup_add 8 nanodroid_forcesystem
+setup_add 8 nanodroid_bash
-setup_add 9 nanodroid_bash
+setup_add 9 nanodroid_utils
-setup_add 10 nanodroid_nano
-setup_add 11 nanodroid_utils
 
 if grep -q "selected.1=1" "${store_prop}"; then
 	ui_print "  <>> setting property: nanodroid_play [None]"

doc/.nanodroid-setup

@@ -3,15 +3,11 @@ nanodroid_fdroid=1
 nanodroid_apps=1
 nanodroid_play=21
 nanodroid_overlay=1
-nanodroid_zelda=1
 nanodroid_mapsv1=1
 nanodroid_init=1
 nanodroid_gsync=0
 nanodroid_swipe=0
 nanodroid_forcesystem=0
 nanodroid_nlpbackend=1000
-nanodroid_nano=1
 nanodroid_bash=1
 nanodroid_utils=1
-nanodroid_fonts=1
-nanodroid_fdroid=0