adam/Remote-Terminal-for-MeshCore
1
0
Fork 0
mirror of https://github.com/jkingsman/Remote-Terminal-for-MeshCore.git synced 2026-08-06 08:43:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Go crazy style on systemd escaping. Closes #159.

Browse Source
This commit is contained in:
Jack Kingsman
2026-04-04 12:24:36 -07:00
parent c28d22379e
commit b19585db6d
2 changed files with 282 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/setup/install_service.sh
+19 -7
View File
@@ -285,6 +285,18 @@ fi
echo -e "${YELLOW}Writing systemd service file to ${SERVICE_FILE}...${NC}"
# Escape a value for use in a systemd Environment= directive.
# Must handle: % (specifier expansion), " and \ (systemd.syntax unquoting),
# and trailing backslash (line continuation). Wraps in double quotes so
# spaces are preserved.
systemd_escape_env_value() {
local v="$1"
v="${v//\\/\\\\}" # \ → \\ (must be first)
v="${v//\"/\\\"}" # " → \"
v="${v//%/%%}" # % → %%
printf '"%s"' "$v"
}
generate_service_file() {
echo "[Unit]"
echo "Description=RemoteTerm for MeshCore"
@@ -301,14 +313,14 @@ generate_service_file() {
# Transport
case "$TRANSPORT_CHOICE" in
2) echo "Environment=MESHCORE_SERIAL_PORT=${SERIAL_PORT}" ;;
2) echo "Environment=MESHCORE_SERIAL_PORT=$(systemd_escape_env_value "$SERIAL_PORT")" ;;
3)
echo "Environment=MESHCORE_TCP_HOST=${TCP_HOST}"
echo "Environment=MESHCORE_TCP_PORT=${TCP_PORT}"
echo "Environment=MESHCORE_TCP_HOST=$(systemd_escape_env_value "$TCP_HOST")"
echo "Environment=MESHCORE_TCP_PORT=$(systemd_escape_env_value "$TCP_PORT")"
;;
4)
echo "Environment=MESHCORE_BLE_ADDRESS=${BLE_ADDRESS}"
echo "Environment=MESHCORE_BLE_PIN=${BLE_PIN}"
echo "Environment=MESHCORE_BLE_ADDRESS=$(systemd_escape_env_value "$BLE_ADDRESS")"
echo "Environment=MESHCORE_BLE_PIN=$(systemd_escape_env_value "$BLE_PIN")"
;;
esac
@@ -319,8 +331,8 @@ generate_service_file() {
# Basic auth
if [[ "$ENABLE_BOTS" =~ ^[Yy] ]] && [[ "$ENABLE_AUTH" =~ ^[Yy] ]]; then
echo "Environment=MESHCORE_BASIC_AUTH_USERNAME=${AUTH_USERNAME}"
echo "Environment=MESHCORE_BASIC_AUTH_PASSWORD=${AUTH_PASSWORD}"
echo "Environment=MESHCORE_BASIC_AUTH_USERNAME=$(systemd_escape_env_value "$AUTH_USERNAME")"
echo "Environment=MESHCORE_BASIC_AUTH_PASSWORD=$(systemd_escape_env_value "$AUTH_PASSWORD")"
fi
# Serial group access