drop shell utilities

ChangeLog.md

@@ -25,6 +25,8 @@
 
 * Full package
   * add `Warden` an app management utility that let's you disable Services and Trackers
+  * drop shell utilites from the package
+     * except `lesskey` and `lessecho`, they'll be installed together with `bash` and `less` if `nanodroid_bash=1`
 
 * build-package
   * allow side-loading custom APKs from `local` directory inside the NanoDroid tree

CommonInstaller

@@ -13,7 +13,6 @@ config_locations="${STORAGE} /external_sd /sdcard1 /data"
 privapp_patterns=("(type 0x11)0x[1357]2" "(type 0x11)0xc212" "(type 0x11)0x[02]" "(type 0x11)0x[13]02" "(type 0x11)0x1[01]2" "(type 0x11)0x1001")
 
 nanodroid_all_init='"10_sqlite 20_fstrim 30_logcat 40_external_sd 50_logscleaner"'
-nanodroid_all_utils='"findfs findmnt hexdump lessecho lesskey lsblk lscpu lsipc lslocks lsns ncal whereis"'
 
 ##########################################################################################
 # NanoDroid Installer Setup Function
@@ -1250,8 +1249,12 @@ install_bash () {
 		nanodroid_install_file xbin/bash bin
 		nanodroid_install_file xbin/bash.bin.${BIN_ARCH} bin
 		nanodroid_install_file xbin/bashbug.${BIN_ARCH} bin
+
+		print_info " << with Less Pager"
 		nanodroid_install_file xbin/less bin
 		nanodroid_install_file xbin/less.bin.${BIN_ARCH} bin
+		nanodroid_install_file xbin/lessecho.${BIN_ARCH} bin
+		nanodroid_install_file xbin/lesskey.${BIN_ARCH} bin
 	else	print_info " << without GNU Bash Shell"
 	fi
 }
@@ -1281,25 +1284,6 @@ install_nanodroidscripts () {
 	fi
 }
 
-##########################################################################################
-# Install Shell Utilities
-##########################################################################################
-
-install_shell_utils () {
-	if [ -n "${nanodroid_utils}" ]; then
-		print_info " << with Shell Utilities"
-
-		for binary in ${nanodroid_utils}; do
-			if [ -f "${INSTALLER}/system/xbin/${binary}.${BIN_ARCH}" ]; then
-				nanodroid_install_file xbin/${binary}.${BIN_ARCH} bin
-			else
-				ui_print " -- ${binary} is not a known shell util"
-			fi
-		done
-	else	print_info " << without Shell Utilities"
-	fi
-}
-
 ##########################################################################################
 # Install init scripts
 ##########################################################################################
@@ -1962,14 +1946,6 @@ check_cfg_setup () {
 		set_prop nanodroid_init "${nanodroid_all_init}"
 	fi
 
-	[ -z "${nanodroid_utils+x}" ] && set_prop nanodroid_utils "${nanodroid_all_utils}"
-
-	# in NanoDroid 22.7 nanodroid_util has changed
-	if [ "${#nanodroid_utils}" -eq 1 ]; then
-		sed -e '/^nanodroid_utils/d' -i "${cfg_setup}"
-		set_prop nanodroid_utils "${nanodroid_all_utils}"
-	fi
-
 	# in NanoDroid 21.0.90 nanodroid_override was dropped
 	sed -e '/^nanodroid_override/d' -i "${cfg_setup}"
 
@@ -1982,6 +1958,9 @@ check_cfg_setup () {
 	# in NanoDroid 22.6 nanodroid_zelda was dropped
 	sed -e '/^nanodroid_zelda/d' -i "${cfg_setup}"
 
+	# in NanoDroid 23.0 nanodroid_utils was dropped
+	sed -e '/^nanodroid_uitls/d' -i "${cfg_setup}"
+
 	source "${cfg_setup}"
 }
 

README.md

@@ -156,8 +156,7 @@ NanoDroid includes
 * on-device framework-patcher for microG support (signature spoofing)
   * with automatic de-odexing up to Android 8.1
 * additional components
-  * GNU Bash shell
-  * several utilities from `util-linux`, `bsdmainutils` and more
+  * GNU Bash shell (with Less pager)
   * Addon.d support for System Mode installation
      * restores NanoDroid after ROM update
      * re-debloates GApps, if required

doc/.nanodroid-setup

@@ -86,25 +86,6 @@ nanodroid_overlay=1
 #	1 = install GNU Bash
 nanodroid_bash=1
 
-# nanodroid_utils:	whether and what shell utils to install
-# supported packages:	Full
-# for more information:	https://gitlab.com/Nanolx/NanoDroid#shell-utilities
-# this setting is a list of utils, each listed item will be installed, possible values
-#	findfs
-#	findmnt
-#	hexdump
-#	lessecho
-#	lesskey
-#	lsblk
-#	lscpu
-#	lsipc
-#	lslocks
-#	lsns
-#	ncal
-#	whereis
-# leave empty (nanodroid_utils="") to install no utils, "" are mandatory in any case
-nanodroid_utils="findfs findmnt hexdump lessecho lesskey lsblk lscpu lsipc lslocks lsns ncal whereis"
-
 # nanodroid_init:	whether and what init scripts to install
 # supported packages:	Full
 # for more information:	https://gitlab.com/Nanolx/NanoDroid#init-scripts

doc/AlterInstallation.md

@@ -12,7 +12,6 @@ Table of Contents
          * [nanodroid_apps](#nanodroid_apps)
          * [nanodroid_overlay](#nanodroid_overlay)
          * [nanodroid_bash](#nanodroid_bash)
-         * [nanodroid_utils](#nanodroid_utils)
          * [nanodroid_init](#nanodroid_init)
          * [nanodroid_gsync](#nanodroid_gsync)
          * [nanodroid_swipe](#nanodroid_swipe)
@@ -166,36 +165,6 @@ Syntax: `nanodroid_bash=1`, value can be 0: 1:
 * 0 = don't install GNU Bash
 * 1 = install GNU Bash
 
-### nanodroid_utils
-
-whether and what shell utils to install
-
-* supported packages
-  * Full package
-
-Syntax: `nanodroid_utils="findfs findmnt hexdump lessecho lesskey lsblk lscpu lsipc lslocks lsns ncal whereis"`
-
-this setting is a list of utils, each listed item will be installed, possible values are
-
-```
-findfs
-findmnt
-hexdump
-lessecho
-lesskey
-lsblk
-lscpu
-lsipc
-lslocks
-lsns
-ncal
-whereis
-```
-
-to install no utils, leave empty (`nanodroid_utils=""`), the `""` are mandatory in any case
-
-see [here for more information](../README.md#shell-utilities)
-
 ### nanodroid_init
 
 whether and what init scripts to install

doc/Details.md

@@ -7,7 +7,6 @@ Table of Contents
       * [NanoDroid-Perm](#nanodroid-perm)
       * [NanoDroid-Util](#nanodroid-util)
       * [init scripts](#init-scripts)
-      * [Shell Utilities](#shell-utilities)
       * [GNU Bash](#gnu-bash)
       * [microG](#microg)
       * [F-Droid](#f-droid)
@@ -89,40 +88,16 @@ When installed to /system your ROM needs to support running scripts in
 
 or you can use **Kernel Adiutor's** init.d emulation.
 
-## Shell Utilities
-
-Several utilities from `bsdmainutils` and `util-linux` are included:
-
-[> bsdmainutils Launchpad](https://launchpad.net/ubuntu/+source/bsdmainutils)
-
-* column
-* hexdump
-* ncal
-
-[> util-linux GitHub](https://github.com/karelzak/util-linux)
-
-* findfs
-* findmnt
-* lsblk
-* lscpu
-* lsipc
-* lslocks
-* lsns
-* whereis
-
-Other shell utilities
-
-* less [> Website](http://www.greenwoodsoftware.com/less/)
-  * lessecho
-  * lesskey
-* unzip [> Website](http://www.info-zip.org/UnZip.html)
-
 ## GNU Bash
 
 NanoDroid includes GNU Bash shell.
 
 * [> GNU Bash Website](https://www.gnu.org/software/bash/bash.html)
 
+The [> less](http://www.greenwoodsoftware.com/less/) Pager will be installed alongside.
+
+The `column` utility from [> bsdmainutils Launchpad](https://launchpad.net/ubuntu/+source/bsdmainutils) is included to beautify the output of the `nanodroid-overlay` script.
+
 ## microG
 
 microG is an Open Source replacement for Google Services, full details can be found at the microG homepage [> Website](http://microg.org/)