Remove useless dirname calls

sxmo_common.sh is in $PATH so we can let the shell handle finding it. Running a script with sh -x <scriptname> can be handy for debugging, but doesn't work with these because $0 doesn't get set to the full path to the script. Signed-off-by: Willow Barraco <contact@willowbarraco.fr>
2023-08-14 13:26:03 -04:00
parent da36357b4f
commit 228b936f08
19 changed files with 19 additions and 21 deletions
--- a/scripts/appscripts/sxmo_screenshot_selection.sh
+++ b/scripts/appscripts/sxmo_screenshot_selection.sh
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Copyright 2022 Sxmo Contributors
 # title="$icon_cam Screenshot (selection)"
-dir="$(dirname "$0")"
-"$dir/sxmo_screenshot.sh" selection
+sxmo_screenshot.sh selection
--- a/scripts/appscripts/sxmo_youtube_audio.sh
+++ b/scripts/appscripts/sxmo_youtube_audio.sh
@@ -2,5 +2,4 @@
 # SPDX-License-Identifier: AGPL-3.0-only
 # Copyright 2022 Sxmo Contributors
 # title="$icon_ytb YouTube (audio)"
-dir="$(dirname "$0")"
-"$dir/sxmo_youtube.sh" audio
+sxmo_youtube.sh audio
--- a/scripts/core/sxmo_bluetoothmenu.sh
+++ b/scripts/core/sxmo_bluetoothmenu.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh

--- a/scripts/core/sxmo_killwindow.sh
+++ b/scripts/core/sxmo_killwindow.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 case "$SXMO_WM" in
 	sway) swaymsg kill;;
--- a/scripts/core/sxmo_mmsdconfig.sh
+++ b/scripts/core/sxmo_mmsdconfig.sh
@@ -5,7 +5,7 @@
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 set -e

--- a/scripts/core/sxmo_networks.sh
+++ b/scripts/core/sxmo_networks.sh
@@ -6,7 +6,7 @@
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 set -e

--- a/scripts/core/sxmo_phonemenu.sh
+++ b/scripts/core/sxmo_phonemenu.sh
@@ -5,7 +5,7 @@
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 set -e

--- a/scripts/core/sxmo_rotate.sh
+++ b/scripts/core/sxmo_rotate.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 applyptrmatrix() {
 	[ -n "$SXMO_TOUCHSCREEN_ID" ] && xinput set-prop "$SXMO_TOUCHSCREEN_ID" --type=float --type=float "Coordinate Transformation Matrix" "$@"
--- a/scripts/core/sxmo_type.sh
+++ b/scripts/core/sxmo_type.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 wtype_to_xdotool() {
 	if [ "$#" -eq 0 ]; then
--- a/scripts/core/sxmo_upgrade.sh
+++ b/scripts/core/sxmo_upgrade.sh
@@ -3,7 +3,7 @@
 # Copyright 2022 Sxmo Contributors
 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 trap "read -r" EXIT

--- a/scripts/core/sxmo_validnumber.sh
+++ b/scripts/core/sxmo_validnumber.sh
@@ -3,7 +3,7 @@
 # Copyright 2022 Sxmo Contributors

 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 returnvalid() {
 	printf %s "$1"
--- a/scripts/core/sxmo_version.sh
+++ b/scripts/core/sxmo_version.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 printf "Sxmo "
 cat "$(xdg_data_path sxmo/version)"
--- a/scripts/core/sxmo_vvmdconfig.sh
+++ b/scripts/core/sxmo_vvmdconfig.sh
@@ -5,7 +5,7 @@
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 set -e

--- a/scripts/core/sxmo_wm.sh
+++ b/scripts/core/sxmo_wm.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 xorgdpms() {
 	STATE=off
--- a/scripts/modem/sxmo_modemlog.sh
+++ b/scripts/modem/sxmo_modemlog.sh
@@ -4,6 +4,6 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 sxmo_terminal.sh sh -c "tail -n9999 -f $SXMO_LOGDIR/modemlog.tsv"
--- a/scripts/modem/sxmo_vvm.sh
+++ b/scripts/modem/sxmo_vvm.sh
@@ -6,7 +6,7 @@
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 stderr() {
 	sxmo_log "$*"
--- a/scripts/notifications/sxmo_notificationmonitor.sh
+++ b/scripts/notifications/sxmo_notificationmonitor.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 handlenewnotiffile(){
 	NOTIFFILE="$1"
--- a/scripts/notifications/sxmo_notificationsmenu.sh
+++ b/scripts/notifications/sxmo_notificationsmenu.sh
@@ -6,7 +6,7 @@
 # shellcheck source=configs/default_hooks/sxmo_hook_icons.sh
 . sxmo_hook_icons.sh
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 notificationmenu() {
 	CHOICES="$icon_cls Close Menu\n$icon_del Clear Notifications"
--- a/scripts/notifications/sxmo_notificationwrite.sh
+++ b/scripts/notifications/sxmo_notificationwrite.sh
@@ -4,7 +4,7 @@

 # include common definitions
 # shellcheck source=scripts/core/sxmo_common.sh
-. "$(dirname "$0")/sxmo_common.sh"
+. sxmo_common.sh

 # Takes 4 args:
 # (1) the filepath of the notification to write (or random to generate a random id)