build.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-rm *.zip 2>/dev/null
-eval $(grep -v ' ' module.prop)
-printf '%s\n' * | grep -v 'zip$' | xargs zip -r "magisk-$name-$version-$versionCode.zip"
-adb push "magisk-$name-$version-$versionCode.zip" /sdcard/

customize.sh

@@ -1,16 +1,15 @@
 #!/bin/sh
 $BOOTMODE || abort "! must be installed in the running system"
 if [[ -e /proc/config.gz ]]; then
-    zcat /proc/config.gz | grep -Eq 'CONFIG_USB_(CONFIGFS_)?F_HID=[my]' || abort "! kernel does not have the required modules"
+	zcat /proc/config.gz | grep -Eq 'CONFIG_USB_(CONFIGFS_)?F_HID=[my]' || abort "! kernel does not have the required modules"
 else
-    [[ -d /config/usb_gadget ]]                    || abort "! kernel does not have the required modules"
+	[[ -d /config/usb_gadget ]]                    || abort "! kernel does not have the required modules"
-    mkdir /config/usb_gadget/g1                    || abort "! kernel does not have the required modules"
+	mkdir /config/usb_gadget/g1                    || abort "! kernel does not have the required modules"
-    mkdir /config/usb_gadget/g1/functions/hid.usb0 || abort "! kernel does not have the required modules"
+	mkdir /config/usb_gadget/g1/functions/hid.usb0 || abort "! kernel does not have the required modules"
 fi
 chmod 755 "$MODPATH/system/bin/ghid.sh"
 sed "s@\[MODDIR\]@$MODPATH@g" "$MODPATH/system/bin/ghid.sh" | sed 's/modules_update/modules/g' >"$TMPDIR/ghid.sh"
 cp "$TMPDIR/ghid.sh" "$MODPATH/system/bin/ghid.sh"
-FILE_CONTEXTS=$(find /system -name plat_file_contexts 2>/dev/null | head -n 1)
 
 . "$MODPATH/utils.sh"
 . "$MODPATH/flash_script.sh"

hidg_contexts

@@ -1 +0,0 @@
-/dev/hidg[0-9]+               u:object_r:null_device:s0

module.prop

@@ -1,6 +1,6 @@
 id=ghid
 name=ghid
-version=0.12.44
+version=0.11
-versionCode=44
+versionCode=38
 author=lordwelch
 description=creates ghid device files in /dev

overlay.d/ghid.rc

@@ -1,5 +1,8 @@
-on property:sys.usb.ffs.ready=1 && property:sys.usb.config=adb && property:sys.usb.configfs=1
+on property:sys.usb.ffs.ready=1 && property:sys.usb.config=* && property:sys.usb.configfs=1
     exec u:r:magisk:s0 root root -- /system/bin/ghid.sh setup ${sys.usb.config}
+    start ghid
 
-on property:sys.usb.ffs.ready=1 && property:sys.usb.state=adb && property:sys.usb.configfs=1
+service ghid /system/bin/ghid.sh setup ${sys.usb.config}
-    exec u:r:magisk:s0 root root -- /system/bin/ghid.sh fix ${sys.usb.config}
+    user root
+    disabled
+    oneshot

post-fs-data.sh

@@ -1,4 +0,0 @@
-{
-    grep -v /dev/hidg $FILE_CONTEXTS
-    cat "$MODPATH/hidg_contexts"
-} >"$MODPATH/system/etc/selinux/plat_file_contexts"

system/bin/ghid.sh

@@ -11,8 +11,8 @@ set -o nohup
 set +o errexit
 set +o sh
 set +o posix
-exec >>$moddir/oghid.log
+exec >>$moddir/ghid.log
-exec 2>>$moddir/oghid.log
+exec 2>>$moddir/ghid.log
 
 remove_ghid() {
         echo "disabling ghid"
@@ -55,44 +55,24 @@ enable_ghid() {
                 cd /config/usb_gadget/g1/configs/b.1/
                 /data/adb/magisk/busybox ln -nsf ../../../../usb_gadget/g1/functions/hid.usb0 ./fhid
         done
-        echo none >/config/usb_gadget/g1/UDC
+        # echo none >/config/usb_gadget/g1/UDC
-        echo "$controller" >/config/usb_gadget/g1/UDC
+        # echo "$controller" >/config/usb_gadget/g1/UDC
 
 }
 
 echo success ghid was run with: "$@"
 
-# if ! [[ "$1" == "setup" ]]; then
+if ! [[ "$1" == "setup" ]]; then
-#         exit 1
+        exit 1
-# fi
+fi
-# shift
+shift
-
 
 case "$1" in
-        "setup" )
+        ""|"none" )
-                shift
+                remove_ghid
-                case "$1" in
-                        ""|"none" )
-                                remove_ghid
-                                ;;
-                        * )
-                                enable_ghid
-                        ;;
-                esac
-                ;;
-        "fix" )
-                shift
-                chcon u:object_r:null_device:s0 /dev/hidg*
-                chmod 666 /dev/hidg*
-
-                # sleep 5
-                chcon u:object_r:null_device:s0 /dev/hidg*
-                chmod 666 /dev/hidg*
-                ls -alZ /dev/hidg*
                 ;;
         * )
-                shift
+                enable_ghid
-                exit 0
         ;;
 esac
-exit 0
+sh <<<'chcon u:object_r:null_device:s0 /dev/hidg*;chmod 666 /dev/hidg*;sleep 5;chcon u:object_r:null_device:s0 /dev/hidg*;chmod 666 /dev/hidg*;ls -alZ /dev/hidg*;' &