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

Some minor corrections (shellcheck)

Browse Source
merge-requests/35/head
w1nst0n 3 years ago
parent 64f322b7db
commit 52868d5ad1
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File

4
CommonAddon
Unescape Escape View File

@ -53,8 +53,8 @@ EOF
} }
ui_print () { ui_print () {
echo -n -e "ui_print ${1}\n" >> /proc/self/fd/${OUTFD} echo -e "ui_print ${1}" >> /proc/self/fd/${OUTFD}
echo -n -e "ui_print\n" >> /proc/self/fd/${OUTFD} echo -e "ui_print" >> /proc/self/fd/${OUTFD}
} }
detect_outfd () { detect_outfd () {

34
CommonInstaller
Unescape Escape View File

@ -77,16 +77,16 @@ print_info () {
echo "${@}" echo "${@}"
decho "${@}" decho "${@}"
else else
echo -n -e "ui_print ${@}\n" >> /proc/self/fd/${OUTFD} echo -e "ui_print ${@}" >> /proc/self/fd/${OUTFD}
echo -n -e "ui_print\n" >> /proc/self/fd/${OUTFD} echo -e "ui_print" >> /proc/self/fd/${OUTFD}
fi fi
} }
show_progress() { show_progress () {
${BOOTMODE} || echo "progress ${1} ${2}" >> /proc/self/fd/${OUTFD} ${BOOTMODE} || echo "progress ${1} ${2}" >> /proc/self/fd/${OUTFD}
} }
set_progress() { set_progress () {
${BOOTMODE} || echo "set_progress ${1}" >> /proc/self/fd/${OUTFD} ${BOOTMODE} || echo "set_progress ${1}" >> /proc/self/fd/${OUTFD}
} }
@ -161,11 +161,11 @@ detect_bootmode () {
# Taken from Magisk, grep build_props / /proc/cmdline for value # Taken from Magisk, grep build_props / /proc/cmdline for value
########################################################################################## ##########################################################################################
grep_prop() { grep_prop () {
sed -n "s/^${1}=//p" /system/build.prop ${2} | head -n 1 sed -n "s/^${1}=//p" /system/build.prop ${2} | head -n 1
} }
grep_cmdline() { grep_cmdline () {
local REGEX="s/^${1}=//p" local REGEX="s/^${1}=//p"
sed -E 's/ +/\n/g' /proc/cmdline | \ sed -E 's/ +/\n/g' /proc/cmdline | \
sed -n "${REGEX}" 2>/dev/null sed -n "${REGEX}" 2>/dev/null
@ -185,7 +185,7 @@ set_perm () {
fi fi
} }
set_perm_recursive() { set_perm_recursive () {
find ${1} -type d 2>/dev/null | while read dir; do find ${1} -type d 2>/dev/null | while read dir; do
set_perm ${dir} ${2} ${3} ${4} ${6} set_perm ${dir} ${2} ${3} ${4} ${6}
done done
@ -234,13 +234,13 @@ toupper() {
} }
find_block () { find_block () {
local block tmp partname devname device local block partname devname device
block=${1}${SLOT} block=${1}${SLOT}
device=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${block} | head -n 1) device=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${block} | head -n 1)
if [ ! -z ${device} ]; then if [ -n "$device" ]; then
readlink -f ${device} readlink -f "$device"
return 0 return 0
fi fi
@ -254,8 +254,8 @@ find_block () {
done done
device=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${block} | head -n 1) device=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${block} | head -n 1)
if [ ! -z ${device} ]; then if [ -n "$device" ]; then
readlink -f ${device} readlink -f "$device"
return 0 return 0
fi fi
@ -1505,8 +1505,8 @@ install_addond () {
installinfo_add () { installinfo_add () {
if [ "${MODE}" = "SYSTEM" ]; then if [ "${MODE}" = "SYSTEM" ]; then
for file in ${@}; do for file in "${@}"; do
echo ${file} >> ${NANODROID_LIST} echo "${file}" >> ${NANODROID_LIST}
done done
fi fi
} }
@ -1530,7 +1530,7 @@ nanodroid_install_file () {
[ -z "${source}" ] && error "file: ${file} not found" [ -z "${source}" ] && error "file: ${file} not found"
# strip off .${BIN_ARCH} from final filename (if any) # strip off .${BIN_ARCH} from final filename (if any)
xfile=$(basename ${file} .${BIN_ARCH}) xfile=$(basename "${file}" .${BIN_ARCH})
decho " installing file: ${xfile}" decho " installing file: ${xfile}"
@ -1627,7 +1627,7 @@ nanodroid_install_apk () {
nanodroid_install_lib "${dest}/${dest_apk}" "${2}" nanodroid_install_lib "${dest}/${dest_apk}" "${2}"
[ "${dir}" == "system/priv-app" ] && create_privapp_permissions_whitelist ${app} [ "${dir}" = "system/priv-app" ] && create_privapp_permissions_whitelist "$app"
set_perm_data -r "${dest}" set_perm_data -r "${dest}"
} }
@ -1638,7 +1638,7 @@ nanodroid_install_apk () {
nanodroid_install_lib () { nanodroid_install_lib () {
apk="${1}" apk="${1}"
dest="$(dirname ${1})" dest="$(dirname "$1")"
multilib="${2}" multilib="${2}"
unset libd unset libd

2
build-package
Unescape Escape View File

@ -47,7 +47,7 @@ done
[[ -z ${1} ]] && show_help [[ -z ${1} ]] && show_help
for opt in ${@}; do for opt in "$@"; do
case ${opt} in case ${opt} in
full) full)
check_nanodroid || error "run 'build-package pull' first!" check_nanodroid || error "run 'build-package pull' first!"

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

@ -12,8 +12,8 @@ detect_bootmode () {
} }
ui_print() { ui_print() {
echo -n -e "ui_print $1\n" >> /proc/self/fd/$OUTFD echo -e "ui_print $1" >> /proc/self/fd/$OUTFD
echo -n -e "ui_print\n" >> /proc/self/fd/$OUTFD echo -e "ui_print" >> /proc/self/fd/$OUTFD
} }
grep_prop() { grep_prop() {
@ -102,13 +102,13 @@ toupper() {
} }
find_block () { find_block () {
local block tmp partname devname device local block partname devname device
block=${1}${SLOT} block=${1}${SLOT}
device=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${block} | head -n 1) device=$(find /dev/block \( -type b -o -type c -o -type l \) -name ${block} | head -n 1)
if [ ! -z ${device} ]; then if [ -n "$device" ]; then
readlink -f ${device} readlink -f "$device"
return 0 return 0
fi fi
@ -122,8 +122,8 @@ find_block () {
done done
device=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${block} | head -n 1) device=$(find /dev \( -type b -o -type c -o -type l \) -maxdepth 1 -iname ${block} | head -n 1)
if [ ! -z ${device} ]; then if [ -n "$device" ]; then
readlink -f ${device} readlink -f "$device"
return 0 return 0
fi fi

Write Preview
Loading…
Cancel
Save