From 599703d13ba143d588476685dd9499210becd4b8 Mon Sep 17 00:00:00 2001
From: Dimitri Papadopoulos
<3234522+DimitriPapadopoulos@users.noreply.github.com>
Date: Thu, 16 Apr 2020 10:29:10 +0200
Subject: [PATCH] More robust sed rules
---
snap/hooks/install | 2 +-
snap/hooks/post-refresh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/snap/hooks/install b/snap/hooks/install
index a34ad7c..3af19fc 100755
--- a/snap/hooks/install
+++ b/snap/hooks/install
@@ -3,5 +3,5 @@
OPENFORTIVPN_TEMPLATE="${SNAP}/share/openfortivpn/config.template"
OPENFORTIVPN_CONFIG="${SNAP_COMMON}/config"
-sed -e '3,$ s/^/# /' "$OPENFORTIVPN_TEMPLATE" > "$OPENFORTIVPN_CONFIG"
+sed -e '/^#/n;/^\s*$/n;s/^/# /' "$OPENFORTIVPN_TEMPLATE" > "$OPENFORTIVPN_CONFIG"
chmod 600 "$OPENFORTIVPN_CONFIG"
diff --git a/snap/hooks/post-refresh b/snap/hooks/post-refresh
index 69a00fa..dbf0190 100755
--- a/snap/hooks/post-refresh
+++ b/snap/hooks/post-refresh
@@ -6,6 +6,6 @@ OPENFORTIVPN_CONFIG="${SNAP_COMMON}/config"
if [ -f "$OPENFORTIVPN_CONFIG" ]; then
echo "Existing configuration file will not be overwritten"
else
- sed -e '3,$ s/^/# /' "$OPENFORTIVPN_TEMPLATE" > "$OPENFORTIVPN_CONFIG"
+ sed -e '/^#/n;/^\s*$/n;s/^/# /' "$OPENFORTIVPN_TEMPLATE" > "$OPENFORTIVPN_CONFIG"
chmod 600 "$OPENFORTIVPN_CONFIG"
fi
--
GitLab