WIP

install.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 LOGS_DIR_PATH="/var/log/asus-numberpad-driver"
 
 source install_logs.sh

install_calc_toggle.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 # INHERIT VARS
 INSTALL_DIR_PATH="/usr/share/asus-numberpad-driver"
 

install_device_check.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 INTERFACES=$(for i in $(i2cdetect -l | grep DesignWare | sed -r "s/^(i2c\-[0-9]+).*/\1/"); do echo $i; done)
 if [ -z "$INTERFACES" ]; then
     echo "No i2c interface can be found. Make sure you have installed libevdev packages"

install_external_keyboard_toggle.sh

@@ -1,6 +1,8 @@
 
 #!/bin/bash
 
+source non_sudo_check.sh
+
 # INHERIT VARS
 #INSTALL_DIR_PATH="/usr/share/asus-numberpad-driver"
 #CONFIG_FILE_DIR_PATH="$INSTALL_DIR_PATH"

install_layout_auto_suggestion.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 LAPTOP_NAME=$(sudo dmidecode -s system-product-name | rev | cut -d ' ' -f1 | rev | cut -d "_" -f1)
 LAPTOP_NAME_FULL=$(sudo dmidecode -s system-product-name)
 

install_layout_select.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 DEVICE_ID=$(cat /proc/bus/input/devices | grep ".*Touchpad\"$" | sort | cut -f 3 -d" " | cut -f 2 -d ":" | head -1)
 
 if [ -z "$LAYOUT_NAME" ]; then

install_logs.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 
+source non_sudo_check.sh
 
 # INHERIT
 if [ -z "$LOGS_DIR_PATH" ]; then

install_service.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 # INHERIT VARS
 if [ -z "$CONFIG_FILE_DIR_PATH" ]; then
     CONFIG_FILE_DIR_PATH="/usr/share/asus-numberpad-driver"

install_user_groups.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 sudo groupadd "input"
 sudo groupadd "i2c"
 sudo groupadd "uinput"

non_sudo_check.sh

@@ -0,0 +1,5 @@
+
+if [[ $(id -u) == 0 ]]; then
+    echo "Please run the install and uninstallation scripts as current user"
+    exit 1
+fi

numberpad.py

@@ -22,9 +22,11 @@
 
 numlock: bool = False
 
-logging.basicConfig()
+logging.basicConfig(
+    format='%(asctime)s %(levelname)-8s %(message)s',
+    level=os.environ.get('LOG', 'INFO')
+)
 log = logging.getLogger('asus-numberpad-driver')
-log.setLevel(os.environ.get('LOG', 'INFO'))
 
 # Constants
 try_times = 5

uninstall.sh

@@ -1,10 +1,13 @@
 #!/bin/bash
 
-LOGS_DIR="/var/log/asus-numberpad-driver"
-LOGS_UNINSTALL_FILE_NAME=uninstall-"$(date +"%d-%m-%Y-%H-%M-%S")".log
-LOGS_UNINSTALL_LOG_FILE_PATH="$LOGS_DIR/$LOGS_UNINSTALL_FILE_NAME"
-sudo mkdir -p "$LOGS_DIR"
-sudo touch "$LOGS_UNINSTALL_LOG_FILE_PATH"
+source non_sudo_check.sh
+
+LOGS_DIR_PATH="/var/log/asus-numberpad-driver"
+
+# log output from every uninstalling attempt aswell
+LOGS_UNINSTALL_LOG_FILE_NAME=uninstall-"$(date +"%d-%m-%Y-%H-%M-%S")".log
+LOGS_UNINSTALL_LOG_FILE_PATH="$LOGS_DIR_PATH/$LOGS_UNINSTALL_LOG_FILE_NAME"
+touch "$LOGS_UNINSTALL_LOG_FILE_PATH"
 
 {
 	# for `rm` exclude !(xy)

uninstall_calc_toggle.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 # INHERIT VARS
 # 
 # None

uninstall_external_keyboard_toggle.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 # INHERIT VARS
 INSTALL_DIR_PATH="/usr/share/asus-numberpad-driver"
 

uninstall_service.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 SERVICE_INSTALL_FILE_NAME="[email protected]"
 SERVICE_INSTANCE_FILE_NAME="asus_numberpad_driver@$USER.service"
 

uninstall_user_groups.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+source non_sudo_check.sh
+
 sudo rm -f /etc/udev/rules.d/99-input.rules
 
 if [[ $? != 0 ]]; then