Snigdha-OS/snigdhaos-system-config
2
0
Fork 0
mirror of https://github.com/Snigdha-OS/snigdhaos-system-config.git synced 2025-09-20 19:44:58 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

⚡️ perf(improvemnets): increase readiblity, error handling, simplification

Browse Source
This commit is contained in:
Eshan Roy
2024-08-01 04:30:58 +05:30
parent 593f2bacdc
commit fb60de382f
1 changed files with 68 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
usr/bin/launch-terminal
View File

@@ -29,64 +29,71 @@ done
shift $(($OPTIND - 1))
initfile="$(mktemp)"
codefile="$initfile"
echo "#!/usr/bin/env bash" >"$initfile"
initfile=$(mktemp)
codefile=$initfile
echo "#!/usr/bin/env bash" > "$initfile"
if [ "$LAUNCH_TERMINAL_SHELL" != "bash" ]; then
codefile="$(mktemp)"
echo "$LAUNCH_TERMINAL_SHELL $codefile" >>"$initfile"
codefile=$(mktemp)
echo "$LAUNCH_TERMINAL_SHELL $codefile" >> "$initfile"
fi
echo "$1" >>"$codefile"
echo "$1" >> "$codefile"
chmod +x "$initfile"
cmd="\"$initfile\""
terminal=""
declare -A terminals=(["alacritty"]="alacritty -e $cmd || LIBGL_ALWAYS_SOFTWARE=1 alacritty -e $cmd" ["konsole"]="konsole -e $cmd" ["kgx"]="kgx -- $cmd" ["gnome-terminal"]="gnome-terminal --wait -- $cmd" ["xfce4-terminal"]="xfce4-terminal --disable-server --command '$cmd'" ["qterminal"]="qterminal -e $cmd" ["lxterminal"]="lxterminal -e $cmd" ["mate-terminal"]="mate-terminal --disable-factory -e $cmd" ["xterm"]="xterm -e $cmd" ["foot"]="foot -T launch-terminal -e $cmd")
declare -a term_order=("alacritty" "konsole" "kgx" "gnome-terminal" "mate-terminal" "xfce4-terminal" "qterminal" "lxterminal" "xterm" "foot")
declare -A terminals=(
["alacritty"]="alacritty -e $cmd || LIBGL_ALWAYS_SOFTWARE=1 alacritty -e $cmd"
["konsole"]="konsole -e $cmd"
["kgx"]="kgx -- $cmd"
["gnome-terminal"]="gnome-terminal --wait -- $cmd"
["xfce4-terminal"]="xfce4-terminal --disable-server --command '$cmd'"
["qterminal"]="qterminal -e $cmd"
["lxterminal"]="lxterminal -e $cmd"
["mate-terminal"]="mate-terminal --disable-factory -e $cmd"
["xterm"]="xterm -e $cmd"
["foot"]="foot -T launch-terminal -e $cmd"
)
declare -a term_order=(
"alacritty" "konsole" "kgx" "gnome-terminal" "mate-terminal"
"xfce4-terminal" "qterminal" "lxterminal" "xterm" "foot"
)
case "$XDG_CURRENT_DESKTOP" in
KDE)
terminal=konsole
;;
GNOME)
if command -v "kgx" &>/dev/null; then
KDE) terminal=konsole ;;
GNOME)
if command -v "kgx" &> /dev/null; then
terminal=kgx
else
terminal=gnome-terminal
fi
;;
XFCE)
terminal=xfce4-terminal
;;
LXQt)
terminal=qterminal
;;
MATE)
terminal=mate-terminal
;;
esac
if [ -z "$terminal" ] || ! command -v "$terminal" &>/dev/null; then
for i in ${term_order[@]}; do
if command -v "$i" &>/dev/null; then
terminal="$i"
XFCE) terminal=xfce4-terminal ;;
LXQt) terminal=qterminal ;;
MATE) terminal=mate-terminal ;;
*)
for i in "${term_order[@]}"; do
if command -v "$i" &> /dev/null; then
terminal=$i
break
fi
done
fi
;;
esac
if [ -z "$terminal" ]; then
notify-send -t 15000 --app-name=Garuda\ Linux "No terminal installed" "No supported terminal emulator is installed. Please install a terminal emulator like Alacritty."
notify-send -t 15000 --app-name=Snigdha\ OS "No terminal installed" "No supported terminal emulator is installed. Please install a terminal emulator like Alacritty."
exit 1
fi
# Special kgx, thanks gnome
if [ "$terminal" == "kgx" ]; then
sed -i '2i sleep 0.1' $initfile
echo 'kill -SIGINT $PPID' >>$initfile
if [ "$terminal" = "kgx" ]; then
sed -i '2i sleep 0.1' "$initfile"
echo 'kill -SIGINT $PPID' >> "$initfile"
fi
eval "${terminals[${terminal}]}" || {
eval "${terminals[$terminal]}" || {
exitcode=$?
}
@@ -95,6 +102,6 @@ if [ "$codefile" != "$initfile" ]; then
rm "$codefile"
fi
if [ ! -z "$exitcode" ] && [ "$exitcode" != 130 ]; then
if [ -n "$exitcode" ] && [ "$exitcode" != 130 ]; then
exit 2
fi