From ff8fb3958338891bc683b1ce510885f48eff4d17 Mon Sep 17 00:00:00 2001 From: "B. Stack" Date: Thu, 3 Nov 2022 19:00:04 -0400 Subject: initial commit --- src/usr/bin/hwset-thinkpad-p50s | 379 +++++++++++++++++++++ src/usr/bin/netmounts-off | 3 + src/usr/bin/netmounts-on | 2 + src/usr/bin/netmounts-trayicon | 68 ++++ src/usr/bin/vpn-off | 2 + src/usr/bin/vpn-on | 2 + src/usr/bin/vpn-trayicon | 63 ++++ .../share/doc/stackrpms-thinkpad-p50s/README.md | 37 ++ .../hicolor/scalable/status/netmounts-off.svg | 4 + .../icons/hicolor/scalable/status/netmounts-on.svg | 4 + .../icons/hicolor/scalable/status/vpn-off.svg | 4 + .../share/icons/hicolor/scalable/status/vpn-on.svg | 4 + 12 files changed, 572 insertions(+) create mode 100755 src/usr/bin/hwset-thinkpad-p50s create mode 100755 src/usr/bin/netmounts-off create mode 100755 src/usr/bin/netmounts-on create mode 100755 src/usr/bin/netmounts-trayicon create mode 100755 src/usr/bin/vpn-off create mode 100755 src/usr/bin/vpn-on create mode 100755 src/usr/bin/vpn-trayicon create mode 100644 src/usr/share/doc/stackrpms-thinkpad-p50s/README.md create mode 100644 src/usr/share/icons/hicolor/scalable/status/netmounts-off.svg create mode 100644 src/usr/share/icons/hicolor/scalable/status/netmounts-on.svg create mode 100644 src/usr/share/icons/hicolor/scalable/status/vpn-off.svg create mode 100644 src/usr/share/icons/hicolor/scalable/status/vpn-on.svg (limited to 'src/usr') diff --git a/src/usr/bin/hwset-thinkpad-p50s b/src/usr/bin/hwset-thinkpad-p50s new file mode 100755 index 0000000..06dae21 --- /dev/null +++ b/src/usr/bin/hwset-thinkpad-p50s @@ -0,0 +1,379 @@ +#!/bin/sh +# File: /usr/bin/hwset-thinkpad-p50s +# Location: stackrpms-thinkpad-p50s package +# Author: bgstack15 +# SPDX-License-Identifier: GPL-3.0 +# Startdate: 2017-11-10 19:41:58 +# Title: Script that Adjusts Hardware Settings +# Package: stackrpms-thinkpad-p50s +# Purpose: Provide programmatic ways to adjust screen brightness, volume, etc. +# History: +# 2018-12-10 change directory +# 2019-12-26 adapted for Thinkpad P50s and add bright_set max/min/safe +# 2022-11-03 adapted for package +# Usage: +# configure your display manager to react to key combinations, like vol-up to execute: hwset vol up +# Reference: ftemplate.sh 2017-11-10a; framework.sh 2017-11-10a +# Improve: +# Provide better 'screen 0' detection. Right now it is hard-coded to use display LVDS. +# Dependencies: +# devuan-req: bgscripts-core +fiversion="2017-11-10a" +hwsetversion="2022-11-03a" # for Thinkpad P50s + +usage() { + less -F >&2 </dev/null )" + local current_level="$( mixer vol | awk '{print $NF}' )" + + debuglev 3 && ferror "saved: ${saved_level}\tcurrent: ${current_level}" + + # logic: if current level is other than "0:0", save current level and set to 0 + # logic: if current level is "0:0", set to saved level. + if echo "${current_level}" | grep -qE "^0:0$"; + then + # the current level is zero + if test -z "${saved_level}" || echo "${saved_level}" | grep -qvE "[0-9]+:[0-9]+"; + then + # nothing to revert to, so set to a basic level + mixer vol 70 + else + mixer vol "${saved_level}" + fi + else + # current level is not zero + echo "VOL_REGULAR_LEVEL=${current_level}" > "${HWSET_SND_TEMP_FILE}" + mixer vol "0:0" + fi +} + +bright_get() { + #local this_screen="$( xrandr --listactivemonitors | tail -n +2 | grep LVDS | awk '{print $NF}' )" + #xrandr --verbose --screen 0 | grep Brightness | awk '{print $NF}' + cat /sys/class/backlight/intel_backlight/brightness +} + +bright_safe() { + # call: new_brightness="$( bright_safe "${new_brightness}" )" + # this function makes sure the new brightness is not lower than the min and not higher than the max + local requested_brightness="${1}" + local output="$( echo "${requested_brightness}" | grep -oE '^-?[0-9]+(\.[0-9]{0,3})?$' )" + if test -n "${output}"; + then + # so it is a proper decimal number for a brightness value + local lt_min="$( printf '%f<%f\n' "${requested_brightness}" "${HWSET_BRIGHTNESS_MIN}" | bc )" + local gt_max="$( printf '%f>%f\n' "${requested_brightness}" "${HWSET_BRIGHTNESS_MAX}" | bc )" + test "${gt_max}" = "1" && output="${HWSET_BRIGHTNESS_MAX}" + test "${lt_min}" = "1" && output="${HWSET_BRIGHTNESS_MIN}" + #echo "lt=${lt} gt=${gt}" + echo "${output%%.*}" + else + # invalid input, so provide a safe number + echo "${HWSET_BRIGHTNESS_MAX:850}" + fi +} + +bright_up() { + # call: bright_up "${HWSET_BRIGHTNESS_INCREASE_SIZE}" + local current_brightness="$( bright_get )" + local increment="${1}" + local new_brightness="$( printf '%0.2f' "$( printf 'scale=3;%0.2f+%0.2f\n' "${current_brightness}" "${increment}" | bc )" )" + new_brightness="$( bright_safe "${new_brightness}" )" + debuglev 1 && ferror "current brightness:\"${current_brightness}\" new:\"${new_brightness}\"" + printf "${new_brightness}" | sudo tee /sys/class/backlight/intel_backlight/brightness 1>/dev/null + #xrandr --output LVDS1 --brightness "${new_brightness}" +} + +bright_down() { + # call: bright_down "${HWSET_BRIGHTNESS_INCREASE_SIZE}" + local current_brightness="$( bright_get )" + local increment="${1}" + local new_brightness="$( printf '%0.2f' "$( printf 'scale=3;%0.2f-%0.2f\n' "${current_brightness}" "${increment}" | bc )" )" + new_brightness="$( bright_safe "${new_brightness}" )" + debuglev 1 && ferror "current brightness:\"${current_brightness}\" new:\"${new_brightness}\"" + printf "${new_brightness}" | sudo tee /sys/class/backlight/intel_backlight/brightness 1>/dev/null + #xrandr --output LVDS1 --brightness "${new_brightness}" +} + +bright_set() { + # call: bright_set "${value}" + local value="${1}" + #xrandr --output LVDS1 --brightness "${value}" + local value_evaluated="$( echo "${value}" | tr '[a-z]' '[A-Z]' )" + case "${value_evaluated}" in + MAX*) test -n "${HWSET_BRIGHTNESS_MAX}" && value="${HWSET_BRIGHTNESS_MAX}" ;; + MIN*) test -n "${HWSET_BRIGHTNESS_MIN}" && value="${HWSET_BRIGHTNESS_MIN}" ;; + SAFE) test -n "${HWSET_BRIGHTNESS_SAFE}" && value="${HWSET_BRIGHTNESS_SAFE}" ;; + esac + debuglev 2 && ferror "setting to ${value}" + printf "${value}" | sudo tee /sys/class/backlight/intel_backlight/brightness 1>/dev/null +} + +# DEFINE TRAPS + +clean_hwset() { + # use at end of entire script if you need to clean up tmpfiles + #rm -f ${tmpfile} 1>/dev/null 2>&1 + : +} + +CTRLC() { + # use with: trap "CTRLC" 2 + # useful for controlling the ctrl+c keystroke + : +} + +CTRLZ() { + # use with: trap "CTRLZ" 18 + # useful for controlling the ctrl+z keystroke + : +} + +parseFlag() { + flag="$1" + hasval=0 + case ${flag} in + # INSERT FLAGS HERE + "d" | "debug" | "DEBUG" | "dd" ) setdebug; ferror "debug level ${debug}";; + "u" | "usage" | "help" | "h" ) usage; exit 1;; + "V" | "fcheck" | "version" ) ferror "${scriptfile} version ${hwsetversion}"; exit 1;; + #"i" | "infile" | "inputfile" ) getval; infile1=${tempval};; + "c" | "conf" | "conffile" | "config" ) getval; conffile="${tempval}";; + esac + + debuglev 10 && { test ${hasval} -eq 1 && ferror "flag: ${flag} = ${tempval}" || ferror "flag: ${flag}"; } +} + +# DETERMINE LOCATION OF FRAMEWORK +while read flocation; do if test -e ${flocation} && test "$( sh ${flocation} --fcheck 2>/dev/null )" -ge 20170608; then frameworkscript="${flocation}"; break; fi; done <&2 && exit 4 + +# INITIALIZE VARIABLES +# variables set in framework: +# today server thistty scriptdir scriptfile scripttrim +# is_cronjob stdin_piped stdout_piped stderr_piped sendsh sendopts +. ${frameworkscript} || echo "$0: framework did not run properly. Continuing..." 1>&2 +infile1= +outfile1= +logfile=${scriptdir}/${scripttrim}.${today}.out +define_if_new interestedparties "bgstack15@gmail.com" +# SIMPLECONF +define_if_new default_conffile "/etc/hwset.conf" +define_if_new defuser_conffile ~/.config/hwset/hwset.conf + +# REACT TO OPERATING SYSTEM TYPE +case $( uname -s ) in + Linux) [ ];; + *) echo "${scriptfile}: 3. Indeterminate or unsupported OS: $( uname -s )" 1>&2 && exit 3;; +esac + +## REACT TO ROOT STATUS +#case ${is_root} in +# 1) # proper root +# [ ] ;; +# sudo) # sudo to root +# [ ] ;; +# "") # not root at all +# #ferror "${scriptfile}: 5. Please run as root or sudo. Aborted." +# #exit 5 +# [ ] +# ;; +#esac + +# SET CUSTOM SCRIPT AND VALUES +#setval 1 sendsh sendopts<&2 +} + +# make temp files +if test -n "${HWSET_SND_TEMP_FILE}" +then + tempdir="$( dirname "${HWSET_SND_TEMP_FILE}" )" + mkdir -p "${tempdir}" && touch "${HWSET_SND_TEMP_FILE}" +fi + +# MAIN LOOP +#{ + debuglev 2 && ferror "piece:\"${piece}\" action:\"${action}\" value:\"${value}\"" + case "${piece}" in + vol|volume) + case "${action}" in + up|down|mute) + debuglev 1 && ferror vol_${action} "${value:-$HWSET_SND_INCREMENT}" + vol_${action} "${value:-$HWSET_SND_INCREMENT}" + ;; + set) + if test -z "${value}"; + then + # you ran hwset vol set, without a value + # do nothing, silently + debuglev 1 && ferror "Cannot set vol to \"\". Skipped." + else + debuglev 1 && ferror vol_${action} "${value}" + vol_${action} "${value}" + fi + ;; + *) + ferror "${scripttrim}: piece ${piece} was given unknown action ${action}. Aborted." + exit 2 + ;; + esac + ;; + bright|brightness) + case "${action}" in + up|down) + debuglev 1 && ferror bright_${action} "${value:-${HWSET_BRIGHTNESS_INCREMENT}}" + bright_${action} "${value:-${HWSET_BRIGHTNESS_INCREMENT}}" + ;; + set) + if test -z "${value}"; + then + # you ran hwset bright set, without a value + # do nothing, silently + debuglev 1 && ferror "Cannot set brightness to \"\". Skipped." + else + debuglev 1 && ferror bright_${action} "${value}" + bright_${action} "${value}" + fi + ;; + *) + ferror "${scripttrim}: piece ${piece} was given unknown action ${action}. Aborted." + ;; + esac + ;; + *) + ferror "${scripttrim}: Unknown piece ${piece}. Aborted." + exit 2 + ;; + esac +#} | tee -a ${logfile} + +# EMAIL LOGFILE +#${sendsh} ${sendopts} "${server} ${scriptfile} out" ${logfile} ${interestedparties} + +## STOP THE READ CONFIG FILE +#exit 0 +#fi; done; } diff --git a/src/usr/bin/netmounts-off b/src/usr/bin/netmounts-off new file mode 100755 index 0000000..1852a6c --- /dev/null +++ b/src/usr/bin/netmounts-off @@ -0,0 +1,3 @@ +#!/bin/sh +mounts="$( mount | awk '$5~/nfs/{print $3}' )" +for word in ${mounts} ; do umount -lv "${word}" ; done diff --git a/src/usr/bin/netmounts-on b/src/usr/bin/netmounts-on new file mode 100755 index 0000000..3cd3da1 --- /dev/null +++ b/src/usr/bin/netmounts-on @@ -0,0 +1,2 @@ +#!/bin/sh +sudo mount -av -t nfs diff --git a/src/usr/bin/netmounts-trayicon b/src/usr/bin/netmounts-trayicon new file mode 100755 index 0000000..932dcf1 --- /dev/null +++ b/src/usr/bin/netmounts-trayicon @@ -0,0 +1,68 @@ +#!/bin/sh +# File: /usr/bin/netmounts-trayicon +# Location: stackrpms-thinkpad-p50s package +# Author: bgstack15 +# SPDX-License-Identifier: GPL-3.0 +# Startdate: 2022-01-07 14:15 +# Title: Net mounts Trayicon utility +# Package: stackrpms-thinkpad-p50s +# Purpose: Provide easy mount/unmount control for network shares from system tray +# History: +# 2022-11-03 adapted for package +# Usage: +# from ~/.fluxbox/startup +# Reference: vpn-trayicon +# Improve: +# Documentation: +# Dependencies: +# devuan-req: mktrayicon + +clean_netmounts_trayicon() { + { test -e "${netmounts_trayicon}" && echo "q" > "${netmounts_trayicon}" ; } 1>/dev/null 2>&1 & + sleep 1 && rm -f "${netmounts_trayicon}" "${netmounts_KILLFILE}" +} + +export netmounts_trayicon="/var/run/user/$( id -u )/${$}.netmounts.icon" +export netmounts_KILLFILE=/tmp/kill-all-netmounts-trayicons + +test "ON" = "ON" && { + mkfifo "${netmounts_trayicon}" + mktrayicon "${netmounts_trayicon}" & + echo "m Mount net mounts,sudo /usr/bin/netmounts-on|Unmount net mounts,sudo /usr/bin/netmounts-off|quit,echo 'q' > ${netmounts_trayicon} ; touch \"${netmounts_KILLFILE}\"" > "${netmounts_trayicon}" + echo "i networkmanager" > "${netmounts_trayicon}" +} + +rm -f "${netmounts_KILLFILE}" + +trap 'trap "" 2 ; touch "${netmounts_KILLFILE}" ' 2 # CTRL-C + +while ! test -e "${netmounts_KILLFILE}" 2>/dev/null ; +do + status_now=1 + mount | grep -qE 'nfs' && status_now=0 + status_string="$( mount | awk '$5~/nfs/{print $3}' | tr '\n' '\r' )" + if test "${status_string}" != "${status_string_old}" ; then + echo "t ${status_string}" > "${netmounts_trayicon}" + fi + if test "${status_now}" != "${status_old}" ; + then + test -p "${netmounts_trayicon}" && case "${status_now}" in + 0) # netmounts is on now + test -n "${VPN_DEBUG}" && echo "net mounts are mounted (icon file ${netmounts_trayicon})" 1>&2 + echo "i netmounts-on" > "${netmounts_trayicon}" + #echo "t netmounts is on" > "${netmounts_trayicon}" + ;; + 1) # netmounts is off now + test -n "${VPN_DEBUG}" && echo "netmounts are NOT mounted (icon file ${netmounts_trayicon})" 1>&2 + echo "i netmounts-off" > "${netmounts_trayicon}" + echo "t no network mounts" > "${netmounts_trayicon}" + ;; + esac + fi + status_old="${status_now}" + status_string_old="${status_string}" + sleep 1 +done + +# safety shutoff +clean_netmounts_trayicon diff --git a/src/usr/bin/vpn-off b/src/usr/bin/vpn-off new file mode 100755 index 0000000..8270cd4 --- /dev/null +++ b/src/usr/bin/vpn-off @@ -0,0 +1,2 @@ +#!/bin/sh +wg-quick down wg0 diff --git a/src/usr/bin/vpn-on b/src/usr/bin/vpn-on new file mode 100755 index 0000000..51e632a --- /dev/null +++ b/src/usr/bin/vpn-on @@ -0,0 +1,2 @@ +#!/bin/sh +wg-quick up wg0 diff --git a/src/usr/bin/vpn-trayicon b/src/usr/bin/vpn-trayicon new file mode 100755 index 0000000..224e5cc --- /dev/null +++ b/src/usr/bin/vpn-trayicon @@ -0,0 +1,63 @@ +#!/bin/sh +# File: /usr/bin/vpn-trayicon +# Location: stackrpms-thinkpad-p50s package +# Author: bgstack15 +# SPDX-License-Identifier: GPL-3.0 +# Startdate: 2021-12-26 21:10 +# Title: Vpn Trayicon utility +# Package: stackrpms-thinkpad-p50s +# Purpose: Provide easy vpn control from system tray +# History: +# 2022-11-03 adapted for package +# Usage: +# On demand, run vpn-trayicon +# Reference: keyboard-leds-trayicons +# Improve: +# Documentation: +# for some stupid reason sudo /usr/local/bin/vpn-on doesn't work, so I just use the real commands here. +# Dependencies: +# devuan-req: mktrayicon + +clean_vpn_trayicon() { + { test -e "${vpn_trayicon}" && echo "q" > "${vpn_trayicon}" ; } 1>/dev/null 2>&1 & + sleep 1 && rm -f "${vpn_trayicon}" "${vpn_KILLFILE}" +} + +export vpn_trayicon="/var/run/user/$( id -u )/${$}.vpn.icon" +export vpn_KILLFILE=/tmp/kill-all-vpn-trayicons + +test "ON" = "ON" && { + mkfifo "${vpn_trayicon}" + mktrayicon "${vpn_trayicon}" & + echo "m Turn vpn on,sudo wg-quick up wg0|Turn vpn off,sudo wg-quick down wg0|quit,echo 'q' > ${vpn_trayicon} ; touch \"${vpn_KILLFILE}\"" > "${vpn_trayicon}" + echo "i networkmanager" > "${vpn_trayicon}" +} + +rm -f "${vpn_KILLFILE}" + +trap 'trap "" 2 ; touch "${vpn_KILLFILE}" ' 2 # CTRL-C + +while ! test -e "${vpn_KILLFILE}" 2>/dev/null ; +do + ip -o a s wg0 1>/dev/null 2>&1 ; status_now=$? ; + if test "${status_now}" != "${status_old}" ; + then + test -p "${vpn_trayicon}" && case "${status_now}" in + 0) # vpn is on now + test -n "${VPN_DEBUG}" && echo "vpn is on (icon file ${vpn_trayicon})" 1>&2 + echo "i vpn-on" > "${vpn_trayicon}" + echo "t vpn is on" > "${vpn_trayicon}" + ;; + 1) # vpn is off now + test -n "${VPN_DEBUG}" && echo "vpn is off (icon file ${vpn_trayicon})" 1>&2 + echo "i vpn-off" > "${vpn_trayicon}" + echo "t vpn is off" > "${vpn_trayicon}" + ;; + esac + fi + status_old="${status_now}" + sleep 1 +done + +# safety shutoff +clean_vpn_trayicon diff --git a/src/usr/share/doc/stackrpms-thinkpad-p50s/README.md b/src/usr/share/doc/stackrpms-thinkpad-p50s/README.md new file mode 100644 index 0000000..b31326b --- /dev/null +++ b/src/usr/share/doc/stackrpms-thinkpad-p50s/README.md @@ -0,0 +1,37 @@ + + +# Overview +This project, `/mnt/public/Support/Platforms/stackrpms-thinkpad-p50s/` holds a git repository of my package of useful settings for Thinkpad P50s systems, which include: + +* ltb-018 Shiny +* ltb-020 Clone +* ltb-021 Copy + +Some configurations include: + +* Xmodmap, automatically applied by the provided fluxbox startup file +* Netmounts tray icon +* Vpn tray icon +* hwset customized for Thinkpad P50s +* Fluxbox settings available in /etc/stackrpms-thinkpad-p50s/. You can symlink them with: + + ln -sf /etc/stackrpms-thinkpad-p50s/fluxbox.keys ~/.fluxbox/keys + ln -sf /etc/stackrpms-thinkpad-p50s/fluxbox.startup ~/.fluxbox/startup + +# Using +Install this package, and symlink the fluxbox config files as seen above. Optionally, install those in the /etc/skel path for `.fluxbox/`. diff --git a/src/usr/share/icons/hicolor/scalable/status/netmounts-off.svg b/src/usr/share/icons/hicolor/scalable/status/netmounts-off.svg new file mode 100644 index 0000000..472c3cc --- /dev/null +++ b/src/usr/share/icons/hicolor/scalable/status/netmounts-off.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/usr/share/icons/hicolor/scalable/status/netmounts-on.svg b/src/usr/share/icons/hicolor/scalable/status/netmounts-on.svg new file mode 100644 index 0000000..f9c3e08 --- /dev/null +++ b/src/usr/share/icons/hicolor/scalable/status/netmounts-on.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/usr/share/icons/hicolor/scalable/status/vpn-off.svg b/src/usr/share/icons/hicolor/scalable/status/vpn-off.svg new file mode 100644 index 0000000..17a0cc7 --- /dev/null +++ b/src/usr/share/icons/hicolor/scalable/status/vpn-off.svg @@ -0,0 +1,4 @@ + + + + diff --git a/src/usr/share/icons/hicolor/scalable/status/vpn-on.svg b/src/usr/share/icons/hicolor/scalable/status/vpn-on.svg new file mode 100644 index 0000000..e94b2ea --- /dev/null +++ b/src/usr/share/icons/hicolor/scalable/status/vpn-on.svg @@ -0,0 +1,4 @@ + + + + -- cgit