From 635c736432170b42cd8325f52481508fb557c0ac Mon Sep 17 00:00:00 2001 From: littleblack111 Date: Sun, 4 Jun 2023 13:45:31 +0800 Subject: Fixes and finalized auto-update, idle, etc's format --- auto-update.sh | 13 ------------ auto-update.sh.old | 13 ++++++++++++ autoclicker-left.py | 19 ++++++++++++++++++ autoclicker-right.py | 19 ++++++++++++++++++ autoclicker.py | 16 --------------- bin/autoclicker | 3 --- bin/autoclicker-left | Bin 0 -> 7571432 bytes bin/autoclicker-right | Bin 0 -> 9047680 bytes compilerun | 25 ++++++++++++----------- idle.sh | 12 +++++++++-- logs/wallpapertrans.log | 52 ++++++++++++++++++++++++++++++++++++++++++++++++ 11 files changed, 126 insertions(+), 46 deletions(-) delete mode 100755 auto-update.sh create mode 100755 auto-update.sh.old create mode 100755 autoclicker-left.py create mode 100755 autoclicker-right.py delete mode 100755 autoclicker.py delete mode 100755 bin/autoclicker create mode 100755 bin/autoclicker-left create mode 100755 bin/autoclicker-right diff --git a/auto-update.sh b/auto-update.sh deleted file mode 100755 index 1a8e240..0000000 --- a/auto-update.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - - -while true; do - if [[ "$(systemctl is-system-running)" == "running" || "$(systemctl is-system-running)" == "degraded" ]]; then - if [[ "$(xprintidle)" -gt 600000 ]]; then # Changed from 600000 (10 minutes) to 3600000 (1 hour) - #sudo #exec sudo /usr/bin/reflector @/etc/xdg/reflector/reflector.conf & - notify-send "Auto-Updater" "Update in progress, please don't poweroff the computer" && sudo npm update -g & nix-env -u & brew update & yay -Sl > /tmp/yaySl & yay -Syu --noconfirm --disable-download-timeout && flatpak update -y && notify-send -u low "Auto-Updater" "Update Successfully!" && echo \#sleep 3600 || notify-send -u critical "Auto-Updater" "Update Faild!" # pipx upgrade-all - else - sleep 60 - fi - fi -done diff --git a/auto-update.sh.old b/auto-update.sh.old new file mode 100755 index 0000000..1a8e240 --- /dev/null +++ b/auto-update.sh.old @@ -0,0 +1,13 @@ +#!/usr/bin/env bash + + +while true; do + if [[ "$(systemctl is-system-running)" == "running" || "$(systemctl is-system-running)" == "degraded" ]]; then + if [[ "$(xprintidle)" -gt 600000 ]]; then # Changed from 600000 (10 minutes) to 3600000 (1 hour) + #sudo #exec sudo /usr/bin/reflector @/etc/xdg/reflector/reflector.conf & + notify-send "Auto-Updater" "Update in progress, please don't poweroff the computer" && sudo npm update -g & nix-env -u & brew update & yay -Sl > /tmp/yaySl & yay -Syu --noconfirm --disable-download-timeout && flatpak update -y && notify-send -u low "Auto-Updater" "Update Successfully!" && echo \#sleep 3600 || notify-send -u critical "Auto-Updater" "Update Faild!" # pipx upgrade-all + else + sleep 60 + fi + fi +done diff --git a/autoclicker-left.py b/autoclicker-left.py new file mode 100755 index 0000000..d1c2591 --- /dev/null +++ b/autoclicker-left.py @@ -0,0 +1,19 @@ +from time import sleep +from random import uniform +from pynput.mouse import Controller, Button +from sys import argv + +mouse = Controller() + +try: + if len(argv) > 1: + delay = int(argv[1]) // 1000 + while True: + mouse.click(Button.left, 1) + sleep(delay) + else: + while True: + mouse.click(Button.left, 1) + sleep(round(uniform(0.035, 0.055), 3)) +except KeyboardInterrupt: + print("\nKeyboardInterrupt, exiting") diff --git a/autoclicker-right.py b/autoclicker-right.py new file mode 100755 index 0000000..94dc699 --- /dev/null +++ b/autoclicker-right.py @@ -0,0 +1,19 @@ +from time import sleep +from random import uniform +from pynput.mouse import Controller, Button +from sys import argv + +mouse = Controller() + +try: + if len(argv) > 1: + delay = int(argv[1]) // 1000 + while True: + mouse.click(Button.right, 1) + sleep(delay) + else: + while True: + mouse.click(Button.right, 1) + sleep(round(uniform(0.035, 0.055), 3)) +except KeyboardInterrupt: + print("\nKeyboardInterrupt, exiting") diff --git a/autoclicker.py b/autoclicker.py deleted file mode 100755 index 98d6910..0000000 --- a/autoclicker.py +++ /dev/null @@ -1,16 +0,0 @@ -from time import sleep -from random import uniform -from pynput.mouse import Controller, Button -from sys import argv - -mouse = Controller() - -if len(argv) > 1: - delay = int(argv[1]) // 1000 - while True: - mouse.click(Button.left, 1) - sleep(delay) -else: - while True: - mouse.click(Button.left, 1) - sleep(round(uniform(0.035, 0.055), 3)) diff --git a/bin/autoclicker b/bin/autoclicker deleted file mode 100755 index bac8be1..0000000 --- a/bin/autoclicker +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4c4c4a8bc89a0548a10168febe0cfc0d16af25ed22813fd80acf8c1e08030f11 -size 7571432 diff --git a/bin/autoclicker-left b/bin/autoclicker-left new file mode 100755 index 0000000..0015548 Binary files /dev/null and b/bin/autoclicker-left differ diff --git a/bin/autoclicker-right b/bin/autoclicker-right new file mode 100755 index 0000000..11b204b Binary files /dev/null and b/bin/autoclicker-right differ diff --git a/compilerun b/compilerun index 42f1f83..6eaab32 100755 --- a/compilerun +++ b/compilerun @@ -28,7 +28,7 @@ if [[ ${1##*.} == "asm" ]]; then printf "linked into ${1%.*}\n" printf "compiled into executable ${1%.*}\n" printf "Running \"${1%.*}\"\n\n" - ./${1%.*} + ./${1%.*} "${@:2}" elif [[ ${1##*.} == "c" || ${1##*.} == "cc" ]]; then printf "\$ gcc $1 -o ${1%.*}\n" gcc $1 -o ${1%.*} || error=1 @@ -38,7 +38,7 @@ elif [[ ${1##*.} == "c" || ${1##*.} == "cc" ]]; then fi printf "compiled into ${1%.*}\n" printf "Running \"${1%.*}\"\n\n" - ./${1%.*} + ./${1%.*} "${@:2}" elif [[ ${1##*.} == "cpp" ]]; then printf "\$ g++ $1 -o ${1%.*}\n" g++ $1 -o ${1%.*} || error=1 @@ -48,7 +48,7 @@ elif [[ ${1##*.} == "cpp" ]]; then fi printf "compiled into ${1%.*}\n" printf "Running \"${1%.*}\"\n\n" - ./${1%.*} + ./${1%.*} "${@:2}" elif [[ ${1##*.} == "go" ]]; then printf "\$ go build $1\n" go build $1 @@ -58,28 +58,28 @@ elif [[ ${1##*.} == "go" ]]; then fi printf "compiled\n" printf "Running \$ go run $1" - go run $1 + go run $1 "$@" elif [[ ${1##*.} == "cs" ]]; then printf "\$ csc $1\n" - csc $1 + csc ${@:2} if [[ error -eq 1 ]]; then printf "$RED\Crit: ERROR had occured during copmile!!\n" exit 1 fi printf "compiled into ${1%.*}.exe\n" printf "Running \"${1%.*}\"\n\n" - mono ${1%.*}.exe + mono ${1%.*}.exe "${@:3}" elif [[ ${1##*.} == "java" ]]; then printf "\$ javac $1\n" javac $1 printf "compiled into ${1%.*}.class\n" printf "Running \"${1%.*}\"\n\n" - java ${1%.*} + java ${1%.*} "${@:3}" elif [[ ${1##*.} == "py" ]]; then printf "\$ pyinstaller -F $1\n" pyinstaller -F $1 printf "Running \"./dist/${1%.*}\"" - ./dist/${1%.*} + ./dist/${1%.*} "${@:2}" #elif [[ ${1##*.} == "rb" ]]; then #printf "\$ ruby -wc $1\n" #ruby -wc $1 @@ -88,25 +88,26 @@ elif [[ ${1##*.} == "py" ]]; then #ruby $1 elif [[ ${1##*.} == "js" ]]; then printf "\$ node $1\n" - node $1 + node $1 "${@:3}" printf "Running $1" elif [[ ${1##*.} == "ts" ]]; then printf "\$ tsc $1\n" - tsc $1 + tsc $1 "${@:3}" printf "compiled into ${1%.*}.js\n" printf "Running \$ ts-node $1" - ts-node $1 + ts-node $1 "${@:3}" elif [[ ${1##*.} == "dart" ]]; then printf "\$ dart compile exe $1\n" dart compile exe $1 printf "compiled into ${1%.*}\n" printf "Running \$ dart $1" - dart $1 + dart $1 "${@:3}" elif [[ ${1##*.} == "rs" ]]; then printf "\$ rustc $1\n" rustc $1 printf "compiled into ${1%.*}\n" printf "Running \$ ./${1%.*}" + ./${1%.*} "${@:2}" elif [ -e "Makefile" ]; then make sudo make install diff --git a/idle.sh b/idle.sh index ff833a4..5d2d592 100755 --- a/idle.sh +++ b/idle.sh @@ -4,8 +4,16 @@ while true; do if [[ "$(systemctl is-system-running)" == "running" || "$(systemctl is-system-running)" == "degraded" ]]; then if [[ "$(xprintidle)" -gt 600000 ]]; then # Changed from 600000 (10 minutes) to 3600000 (1 hour) - $HOME/scripts/auto-update.sh & - killall picom; bspcomp & + if [ ! -f /var/lock/idle.lock ]; then + $HOME/scripts/update.sh & + killall picom; bspcomp & + sudo touch /var/lock/idle.lock + elif [[ "$(xprintidle)" -le 50 ]]; then + sudo rm -f /var/lock/idle.lock + continue + else + sleep 5 + fi else sleep 60 fi diff --git a/logs/wallpapertrans.log b/logs/wallpapertrans.log index 07b7ea3..5968eb8 100644 --- a/logs/wallpapertrans.log +++ b/logs/wallpapertrans.log @@ -2499,3 +2499,55 @@ See 'feh --help' or 'man feh' for detailed usage information 0 脚本完成于 2023-06-04 09:07:55+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 09:37:55+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 09:38:02+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 10:08:02+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 10:08:08+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 10:38:08+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 10:38:11+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 11:08:11+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 11:08:15+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 11:38:15+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 11:38:21+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 11:54:33+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 11:54:35+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 11:58:11+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 11:58:15+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 11:59:43+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 11:59:47+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 12:03:56+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 12:04:00+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 12:04:21+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 12:04:25+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 12:05:17+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 12:05:20+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 12:35:28+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 12:36:04+08:00 [COMMAND_EXIT_CODE="0"] +脚本启动于 2023-06-04 13:32:36+08:00 [COMMAND="/home/system/.config/bspwm/scripts/wallpapertrans.sh" ] +0 + +脚本完成于 2023-06-04 13:32:40+08:00 [COMMAND_EXIT_CODE="0"] -- cgit v1.2.3