💥 fix(scripts): issues with shell's desktop entry

also made the Ask function to repeat itself if the provided character does not match regex
This commit is contained in:
retrozinndev
2025-08-17 17:40:54 -03:00
parent e6a1d22939
commit b52dedf402
3 changed files with 15 additions and 12 deletions
+6 -3
View File
@@ -49,9 +49,12 @@ if gdbus introspect --session \\
--dest io.github.retrozinndev.colorshell \\ --dest io.github.retrozinndev.colorshell \\
--object-path /io/github/retrozinndev/colorshell > /dev/null 2>&1; then --object-path /io/github/retrozinndev/colorshell > /dev/null 2>&1; then
if command -v socat; then
echo \"\$@\" | socat - \"\${XDG_RUNTIME_DIR:-/run/user/\$(id -u)}/colorshell.sock\" echo \"\$@\" | socat - \"\${XDG_RUNTIME_DIR:-/run/user/\$(id -u)}/colorshell.sock\"
exit 0 exit 0
else
echo \"[warn] \`socat\` not installed, falling back to remote instance communication\"
fi
fi fi
`cat "${outdir:-./build/release}/colorshell" | sed -e 's/^#.*//'`" # remove shebang `cat "${outdir:-./build/release}/colorshell" | sed -e 's/^#.*//'`" # remove shebang
@@ -61,5 +64,5 @@ fi
echo "[info] making desktop entry" echo "[info] making desktop entry"
entry=`cat ./resources/colorshell.desktop` entry=`cat ./resources/colorshell.desktop`
entry=${entry/\$COLORSHELL_BINARY/${bin_target:-\$HOME/.local/bin/colorshell}} bin_target=${bin_target:-'$HOME/.local/bin/colorshell'}
echo -n "$entry" > ${outdir:-./build/release}/colorshell.desktop echo -n "${entry/'$COLORSHELL_BINARY'/${bin_target/'$'/'\\\$'}}" > ${outdir:-./build/release}/colorshell.desktop
-2
View File
@@ -1,5 +1,3 @@
#!/usr/bin/bash
source ./scripts/utils.sh source ./scripts/utils.sh
config_dirs=( config_dirs=(
+7 -5
View File
@@ -1,5 +1,3 @@
#!/usr/bin/env bash
# This script contains useful functions to be used # This script contains useful functions to be used
# in other scripts from colorshell. # in other scripts from colorshell.
# ---------- # ----------
@@ -56,13 +54,17 @@ function Print_header() {
# Input answer is exported as $answer # Input answer is exported as $answer
# ------------- # -------------
function Ask() { function Ask() {
read -n 1 -p "$1 [y/n] " r read -n 1 -p "$@ [y/n] " answer
printf '\n' printf '\n'
export answer=$r if [[ ! $answer =~ [yn] ]]; then
Ask "$@" # restart if different from accepted chars
fi
export answer
} }
# ------------- # -------------
# Ask a yes/no question to user # Ask the user to choose a number from the provided list
# Input answer is exported as $answer # Input answer is exported as $answer
# (this function is not done yet) # (this function is not done yet)
# ------------- # -------------