From 71473c6476290c86c7893e5fe54928df0167625c Mon Sep 17 00:00:00 2001 From: lordwelch Date: Mon, 2 Mar 2020 23:58:43 -0800 Subject: [PATCH] all functionality is here. need to patch boot image now --- META-INF/com/google/android/update-binary | 173 +++++++++++++++++++++ META-INF/com/google/android/updater-script | 1 + bin/ghid.sh | 20 ++- customize.sh | 2 + module.prop | 2 +- overlay.d/ghid.rc | 2 +- overlay.d/sbin/testing | 1 + reports/standard-keyboard | Bin 0 -> 63 bytes 8 files changed, 197 insertions(+), 4 deletions(-) create mode 100644 META-INF/com/google/android/update-binary create mode 100644 META-INF/com/google/android/updater-script create mode 100644 customize.sh create mode 100644 overlay.d/sbin/testing create mode 100644 reports/standard-keyboard diff --git a/META-INF/com/google/android/update-binary b/META-INF/com/google/android/update-binary new file mode 100644 index 0000000..29240cd --- /dev/null +++ b/META-INF/com/google/android/update-binary @@ -0,0 +1,173 @@ +#!/sbin/sh + +################# +# Initialization +################# + +umask 022 + +# Global vars +TMPDIR=/dev/tmp +PERSISTDIR=/sbin/.magisk/mirror/persist + +rm -rf $TMPDIR 2>/dev/null +mkdir -p $TMPDIR + +# echo before loading util_functions +ui_print() { echo "$1"; } + +require_new_magisk() { + ui_print "*******************************" + ui_print " Please install Magisk v19.0+! " + ui_print "*******************************" + exit 1 +} + +is_legacy_script() { + unzip -l "$ZIPFILE" install.sh | grep -q install.sh + return $? +} + +print_modname() { + local len + len=`echo -n $MODNAME | wc -c` + len=$((len + 2)) + local pounds=`printf "%${len}s" | tr ' ' '*'` + ui_print "$pounds" + ui_print " $MODNAME " + ui_print "$pounds" + ui_print "*******************" + ui_print " Powered by Magisk " + ui_print "*******************" +} + +############## +# Environment +############## + +OUTFD=$2 +ZIPFILE=$3 + +mount /data 2>/dev/null + +# Load utility functions +[ -f /data/adb/magisk/util_functions.sh ] || require_new_magisk +. /data/adb/magisk/util_functions.sh +[ $MAGISK_VER_CODE -gt 18100 ] || require_new_magisk + +# Preperation for flashable zips +setup_flashable + +# Mount partitions +mount_partitions + +# Detect version and architecture +api_level_arch_detect + +# Setup busybox and binaries +$BOOTMODE && boot_actions || recovery_actions + +############## +# Preparation +############## + +# Extract prop file +unzip -o "$ZIPFILE" module.prop -d $TMPDIR >&2 +[ ! -f $TMPDIR/module.prop ] && abort "! Unable to extract zip file!" + +$BOOTMODE && MODDIRNAME=modules_update || MODDIRNAME=modules +MODULEROOT=$NVBASE/$MODDIRNAME +MODID=`grep_prop id $TMPDIR/module.prop` +MODPATH=$MODULEROOT/$MODID +MODNAME=`grep_prop name $TMPDIR/module.prop` + +# Create mod paths +rm -rf $MODPATH 2>/dev/null +mkdir -p $MODPATH + +########## +# Install +########## + +if is_legacy_script; then + unzip -oj "$ZIPFILE" module.prop install.sh uninstall.sh 'common/*' -d $TMPDIR >&2 + + # Load install script + . $TMPDIR/install.sh + + # Callbacks + print_modname + on_install + + # Custom uninstaller + [ -f $TMPDIR/uninstall.sh ] && cp -af $TMPDIR/uninstall.sh $MODPATH/uninstall.sh + + # Skip mount + $SKIPMOUNT && touch $MODPATH/skip_mount + + # prop file + $PROPFILE && cp -af $TMPDIR/system.prop $MODPATH/system.prop + + # Module info + cp -af $TMPDIR/module.prop $MODPATH/module.prop + + # post-fs-data scripts + $POSTFSDATA && cp -af $TMPDIR/post-fs-data.sh $MODPATH/post-fs-data.sh + + # service scripts + $LATESTARTSERVICE && cp -af $TMPDIR/service.sh $MODPATH/service.sh + + ui_print "- Setting permissions" + set_permissions +else + print_modname + + unzip -o "$ZIPFILE" customize.sh -d $MODPATH >&2 + + if ! grep -q '^SKIPUNZIP=1$' $MODPATH/customize.sh 2>/dev/null; then + ui_print "- Extracting module files" + unzip -o "$ZIPFILE" -x 'META-INF/*' -d $MODPATH >&2 + + # Default permissions + set_perm_recursive $MODPATH 0 0 0755 0644 + fi + + # Load customization script + [ -f $MODPATH/customize.sh ] && . $MODPATH/customize.sh +fi + +# Handle replace folders +for TARGET in $REPLACE; do + ui_print "- Replace target: $TARGET" + mktouch $MODPATH$TARGET/.replace +done + +if $BOOTMODE; then + # Update info for Magisk Manager + mktouch $NVBASE/modules/$MODID/update + cp -af $MODPATH/module.prop $NVBASE/modules/$MODID/module.prop +fi + +# Copy over custom sepolicy rules +if [ -f $MODPATH/sepolicy.rule -a -e $PERSISTDIR ]; then + ui_print "- Installing custom sepolicy patch" + PERSISTMOD=$PERSISTDIR/magisk/$MODID + mkdir -p $PERSISTMOD + cp -af $MODPATH/sepolicy.rule $PERSISTMOD/sepolicy.rule +fi + +# Remove stuffs that don't belong to modules +rm -rf \ +$MODPATH/system/placeholder $MODPATH/customize.sh \ +$MODPATH/README.md $MODPATH/.git* 2>/dev/null + +############## +# Finalizing +############## + +cd / +$BOOTMODE || recovery_cleanup +rm -rf $TMPDIR + +ui_print "- Done" +exit 0 diff --git a/META-INF/com/google/android/updater-script b/META-INF/com/google/android/updater-script new file mode 100644 index 0000000..11d5c96 --- /dev/null +++ b/META-INF/com/google/android/updater-script @@ -0,0 +1 @@ +#MAGISK diff --git a/bin/ghid.sh b/bin/ghid.sh index 4485b11..f729965 100644 --- a/bin/ghid.sh +++ b/bin/ghid.sh @@ -1,7 +1,8 @@ #!/system/bin/sh # $1 setup controller=$(getprop sys.usb.controller) - +moddir=${0%bin/*} +selected=standard-keyboard remove_ghid() { rm /config/usb_gadget/g1/configs/b.1/fhid rmdir /config/usb_gadget/g1/functions/hid.usb0 @@ -9,15 +10,30 @@ remove_ghid() { } enable_ghid() { + running=true + . "$moddir/definitions/$selected" if [ ! -d /config/usb_gadget/g1/functions/hid.usb0 ]; then mkdir /config/usb_gadget/g1/functions/hid.usb0 fi + current_protocols="$(cat /config/usb_gadget/g1/functions/hid.usb0/protocol)" + current_subclasses="$(cat /config/usb_gadget/g1/functions/hid.usb0/subclass)" + current_report_lengths="$(cat /config/usb_gadget/g1/functions/hid.usb0/report_length)" + + if ! { [[ -e /config/usb_gadget/g1/functions/hid.usb0 -a "$current_protocols" == "$protocols" -a "$current_subclasses" == "$subclasses" -a "$current_report_lengths" == "$report_lengths" ]] && diff "$moddir/reports/$report_names" /config/usb_gadget/g1/functions/hid.usb0/report_desc } ; then + return 0 + fi + echo $protocols >/config/usb_gadget/g1/functions/hid.usb0/protocol + echo $subclasses >/config/usb_gadget/g1/functions/hid.usb0/subclass + echo $report_lengths >/config/usb_gadget/g1/functions/hid.usb0/report_length + cp $report_names /config/usb_gadget/g1/functions/hid.usb0/report_desc + ln -s /config/usb_gadget/g1/functions/hid.usb0 /config/usb_gadget/g1/configs/b.1/fhid + echo "$controller" >/config/usb_gadget/g1/UDC } -if [ "$1" != "setup"]; then +if ! [[ "$1" == "setup" ]]; then exit 1 fi shift diff --git a/customize.sh b/customize.sh new file mode 100644 index 0000000..4d88cfc --- /dev/null +++ b/customize.sh @@ -0,0 +1,2 @@ +sed "s@\[MODDIR\]@$MODPATH@g" "$MODPATH/overlay.d/ghid.rc" | sed 's/modules_update/modules/g' >"$TMPDIR/ghid.rc" +cp "$TMPDIR/ghid.rc" "$MODPATH/overlay.d/ghid.rc" diff --git a/module.prop b/module.prop index ca978cd..2c42677 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=ghid name=ghid version=0 -versionCode=0 +versionCode=6 author=lordwelch description=creates ghid device files in /dev diff --git a/overlay.d/ghid.rc b/overlay.d/ghid.rc index 11cc623..9049d43 100644 --- a/overlay.d/ghid.rc +++ b/overlay.d/ghid.rc @@ -1,2 +1,2 @@ on property:sys.usb.ffs.ready=1 && property:sys.usb.config=* && property:sys.usb.configfs=1 - exec - -- [MODDIR]/bin/ghid.sh setup ${sys.usb.config} \ No newline at end of file + exec - -- [MODDIR]/bin/ghid.sh setup ${sys.usb.config} diff --git a/overlay.d/sbin/testing b/overlay.d/sbin/testing new file mode 100644 index 0000000..038d718 --- /dev/null +++ b/overlay.d/sbin/testing @@ -0,0 +1 @@ +testing diff --git a/reports/standard-keyboard b/reports/standard-keyboard new file mode 100644 index 0000000000000000000000000000000000000000..da2fd4c192bde63cce8e9e22194c583eac70fa02 GIT binary patch literal 63 zcmZQ&