From ab409eca5e574e4c4e01a2af295718ff58d17374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20Schl=C3=BCter?= <bschlueter@posteo.de>
Date: Mon, 29 Jan 2018 15:33:47 +0100
Subject: Change placeholder syntax for networking.

---
 install-itzks-workstation | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'install-itzks-workstation')

diff --git a/install-itzks-workstation b/install-itzks-workstation
index 12507fb..e492040 100644
--- a/install-itzks-workstation
+++ b/install-itzks-workstation
@@ -117,21 +117,21 @@ sed -i 's/NEED_GSSD=.*/NEED_GSSD=/' /etc/default/nfs-common
 touch /etc/NetworkManager/system-connections/BLANK
 cat <<EOT >> /etc/NetworkManager/system-connections/BLANK
 [connection]
-id=<SSID>
-uuid=42d084e4-4ff0-45a0-8aee-771c7a568046
+id=@SSID@
+uuid=@UUID@
 type=wifi
 permissions=
-timestamp=1515144490
+timestamp=@TIMESTAMP@
 autoconnect=true
 
 [wifi]
 mac-address-blacklist=
 mode=infrastructure
-ssid=<SSID>
+ssid=@SSID@
 
 [wifi-security]
 key-mgmt=wpa-psk
-psk=<password>
+psk=@password@
 
 [ipv4]
 dns-search=
@@ -147,18 +147,18 @@ EOT
 # Generate uuid and timestamp and overwrite in file
 
 UUID=$(uuidgen -t)
-sed -i 's/uuid=.*/uuid='"$UUID"'/' /etc/NetworkManager/system-connections/BLANK
+sed -i 's/@UUID@/'"$UUID"'/' /etc/NetworkManager/system-connections/BLANK
 
 TIMESTAMP=$(date +%s )
-sed -i 's/timestamp=.*/timestamp='"$TIMESTAMP"'/' /etc/NetworkManager/system-connections/BLANK
+sed -i 's/@TIMESTAMP@/'"$TIMESTAMP"'/' /etc/NetworkManager/system-connections/BLANK
 
 # Ask user for SSID and password
 echo '!   WIFI-Netzwerk hinzufügen'
 read -p 'Wie lautet die SSID? ' ssid
-sed -i 's/ssid=.*/ssid='"$ssid"'/' /etc/NetworkManager/system-connections/BLANK
-sed -i 's/id=<SSID>/id='"$ssid"'/' /etc/NetworkManager/system-connections/BLANK
+sed -i 's/@SSID@/'"$ssid"'/' /etc/NetworkManager/system-connections/BLANK
+# sed -i 's/id=<SSID>/id='"$ssid"'/' /etc/NetworkManager/system-connections/BLANK
 read -p 'Wie lautet das zugehörige Passwort? ' passw
-sed -i 's/psk=.*/psk='"$passw"'/' /etc/NetworkManager/system-connections/BLANK
+sed -i 's/@password@/'"$passw"'/' /etc/NetworkManager/system-connections/BLANK
 mv /etc/NetworkManager/system-connections/BLANK /etc/NetworkManager/system-connections/"$ssid"
 
 # Set permissions on generated file
-- 
cgit v1.2.3