diff options
Diffstat (limited to 'abs/core/LinHES-system')
| -rwxr-xr-x | abs/core/LinHES-system/LinHES-session | 1 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/PKGBUILD | 19 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/enableIRWake.sh | 22 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/lh_system_backup_job | 11 | ||||
| -rw-r--r-- | abs/core/LinHES-system/lh_system_host_update | 4 | ||||
| -rw-r--r-- | abs/core/LinHES-system/linhes_update2.sh | 2 | ||||
| -rwxr-xr-x | abs/core/LinHES-system/mythwelcome-set-alarm.sh | 11 | ||||
| -rw-r--r-- | abs/core/LinHES-system/system.install | 3 | ||||
| -rw-r--r-- | abs/core/LinHES-system/unclutter-toggle.sh | 5 |
9 files changed, 60 insertions, 18 deletions
diff --git a/abs/core/LinHES-system/LinHES-session b/abs/core/LinHES-system/LinHES-session index 7960bf5..bf71980 100755 --- a/abs/core/LinHES-system/LinHES-session +++ b/abs/core/LinHES-system/LinHES-session @@ -411,6 +411,7 @@ fi # this is done so that starting mythtv can loop. $WM & pid=$! +/usr/LH/bin/enableIRWake.sh & mouse_move keylaunch unclutter diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index a236769..2b769d3 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system -pkgver=8.6.0 -pkgrel=1 +pkgver=8.7.0 +pkgrel=2 arch=('x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -17,7 +17,7 @@ binfiles="LinHES-start optimize_mythdb.py myth_mtc.py mythfrontend-start set_windowmanager.sh myth_status.py myth_status.sh install_supplemental_service.sh get_airplay_key importfiles.sh lh_system_backup lh_system_backup_job lh_system_restore lh_system_restore_job - lh_system_host_update lh_system_all_host_update + lh_system_host_update lh_system_all_host_update enableIRWake.sh add_storage.py balance_storage_groups.py empty_storage_groups.py remove_storage.py diskspace.sh cacheclean lh_backend_control.sh create_media_dirs.sh msg_client.py msg_daemon.py mythvidexport.py @@ -80,14 +80,14 @@ package() { } -md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' +md5sums=('9e941d6c6d4edd56f1a89a7ab566763c' 'ad5e144999b6f37931dea799c2761c7e' 'de32a1c50101265dd7f6ca5037f7a26a' '2d7b8414ddce5f401331342ac1529c22' '76b2637cac0452b3acdbeeb4e8a5474b' '2ee4c6b06d40f2f6058e480d231f60b2' 'dc3eef2a624754e16805d72bbe488b67' - '617af86b901538817ebdcaf646248dc5' + '44c28873afa1d233f0051b52d5071a29' '542e670e78d117657f93141e9689f54d' '8da6a7f1703a002f84e66629e847d8a6' 'bb72ab230c7a71706285bd0f31a4fb1f' @@ -97,11 +97,12 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' '33fbebbd546672cedd3c5e7350ab414e' 'c773d8caacba8fbd4968e8afe5137bc6' '3edef50a49a47694bf8add39cc160add' - '01cbbf411d2a585feb71f2881755e5d8' + '88c9c36430875f9530edb79e11dc770a' 'f421f670a9c74724037f70d1dabcad00' 'eab2d188992b1ac561e0ba968544d7a3' - '74e17d6f7453c52d56fecaed5c3f6ad5' + '5d3c7660510911b718f9839e36320e1c' '47e093e8cfe4b5b96602358e1f540832' + '4cc3401a94500fad269b25c60d99cc4d' '727a886a1ba237906f48cda2e4e7844b' '0c81e5cad656f6260e39cd7585b1421a' 'e5bb027c54a2727d0bcf8d6fb357ba32' @@ -132,12 +133,12 @@ md5sums=('c6e6b83a1f4c35ef4501e277657ab2ac' 'a8bbc553cd784ebed2197b96b60addc8' 'a94fe6d980f4b810f2e2ae5352084b39' '0d1632ea63d8145c173c6aecf0b007f0' - 'ff689f2e9572a78d88384b2e5774f579' + '09b650eceb0b80bb747c5f7650ae2abc' 'a811c5c01cc127ef403a24c941e03c66' '4a1fda884dcd7d65fb2690fbdbd92a83' '29f451783db3220b612e00c29e3ded73' '7fe42dfc99af42a45440c9c3954c3c19' - '411b2c22c66833cc8e85021992409f1f' + 'cc9627eb979b154aa1e31d33cb61afb2' '410795ef9039e4c6c0484e706ecfd567' 'eb879fee9603a05d5420d4ce8ed9e450' '02c810c2f47b7c4495fdacaf54189473' diff --git a/abs/core/LinHES-system/enableIRWake.sh b/abs/core/LinHES-system/enableIRWake.sh new file mode 100755 index 0000000..5b971b7 --- /dev/null +++ b/abs/core/LinHES-system/enableIRWake.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +for vendProdID in `lsusb | sed -e 's/.*ID \([a-f0-9]\+:[a-f0-9]\+\).*/\1/g'` +do + foundRemote=`grep -i "$vendProdID" /usr/MythVantage/templates/remotes/receiver_usb.id` + if [[ $? = 0 ]] + then + #echo Found: $foundRemote + vendID=`echo $vendProdID | cut -d":" -f1` + prodID=`echo $vendProdID | cut -d":" -f2` + for usbDevice in `grep . /sys/bus/usb/devices/*/power/wakeup | cut -d"/" -f6` + do + foundVendID=`cat /sys/bus/usb/devices/$usbDevice/idVendor` + foundProdID=`cat /sys/bus/usb/devices/$usbDevice/idProduct` + if [[ $foundVendID == $vendID && $foundProdID == $prodID ]] + then + echo "Enable wake for $foundRemote on $usbDevice" + sudo sh -c "echo 'enabled' > /sys/bus/usb/devices/$usbDevice/power/wakeup" + fi + done + fi +done diff --git a/abs/core/LinHES-system/lh_system_backup_job b/abs/core/LinHES-system/lh_system_backup_job index 8539ff2..e248e1a 100755 --- a/abs/core/LinHES-system/lh_system_backup_job +++ b/abs/core/LinHES-system/lh_system_backup_job @@ -117,7 +117,16 @@ function backup(){ done echo "Backup home dirs" - tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt $MYTHHOME /home/vncsvc /home/xymon + HOMEDIRS="" + if [ -d /home/vncsvc ] + then + HOMEDIRS="/home/vncsvc" + fi + if [ -d /home/xymon ] + then + HOMEDIRS="$HOMEDIRS /home/xymon" + fi + tar -zcf $BACKUPDIR/$DATE/home_dir.tar.gz -X $MYTHHOME/backup_config/backup_exclude.txt $MYTHHOME $HOMEDIRS if [ -f $MYTHHOME/backup_config/backup_include.txt ] then diff --git a/abs/core/LinHES-system/lh_system_host_update b/abs/core/LinHES-system/lh_system_host_update index 0a63e0a..0d785eb 100644 --- a/abs/core/LinHES-system/lh_system_host_update +++ b/abs/core/LinHES-system/lh_system_host_update @@ -1,6 +1,6 @@ #!/bin/bash # Process that call this script -# func update +# func update # supplemental web echo "Starting Update" @@ -42,7 +42,7 @@ case $Hostupdateplan in echo "" echo "Updating ALL packages" pacman -Sy - pacman --noconfirm -Su --force + pacman --noconfirm -Su ;; "None") echo "" diff --git a/abs/core/LinHES-system/linhes_update2.sh b/abs/core/LinHES-system/linhes_update2.sh index 6c249d3..aa6bc96 100644 --- a/abs/core/LinHES-system/linhes_update2.sh +++ b/abs/core/LinHES-system/linhes_update2.sh @@ -4,7 +4,7 @@ if [[ "$1" = "install" ]] then msg_client.py --msg "Updating...|middle" --timeout 600 --tag "Updating" - sudo pacman -Su --force --noconfirm + sudo pacman -Su --noconfirm msg_client.py --clear --tag "Updating" msg_client.py --kill msg_client.py --msg "Updates complete.\nReturning to Main Menu.|middle" diff --git a/abs/core/LinHES-system/mythwelcome-set-alarm.sh b/abs/core/LinHES-system/mythwelcome-set-alarm.sh index 7b10372..ebb81ef 100755 --- a/abs/core/LinHES-system/mythwelcome-set-alarm.sh +++ b/abs/core/LinHES-system/mythwelcome-set-alarm.sh @@ -21,3 +21,14 @@ echo 0 > /sys/class/rtc/rtc0/wakealarm #this clears your alarm echo $1 > /sys/class/rtc/rtc0/wakealarm #this writes your alarm cat /proc/driver/rtc > /var/log/wake_alarm + +#allows the user to execute additional commands +userCmds=/home/mythtv/mythwelcome-set-alarm-user.sh +if [[ -f "$userCmds" ]] +then + sh $userCmds $1 +else + echo "#!/bin/sh" > $userCmds + chmod a+x $userCmds + chown mythtv:mythtv $userCmds +fi diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install index 558a52a..e0fe68b 100644 --- a/abs/core/LinHES-system/system.install +++ b/abs/core/LinHES-system/system.install @@ -13,9 +13,6 @@ post_install() { rm -f /etc/cron.daily/myth_mtc fi - #run mythwelcome-config.py to update shutdown check to use idle.py - /usr/LH/bin/mythwelcome-config.py - sv restart msg_daemon } diff --git a/abs/core/LinHES-system/unclutter-toggle.sh b/abs/core/LinHES-system/unclutter-toggle.sh index 9b08a14..b3901ca 100644 --- a/abs/core/LinHES-system/unclutter-toggle.sh +++ b/abs/core/LinHES-system/unclutter-toggle.sh @@ -1,7 +1,8 @@ #!/bin/bash PIDUNC=`pidof unclutter` -jitter=200 -idle=1 +jitter=50 +idle=10 +# unclutter.cfg allows the user to set idle and jitter to their own preference . /etc/unclutter.cfg if [ -n "${PIDUNC}" ]; then |