From 0d059b3e06344b164c72ef0616002f25f53daaa3 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 27 Jun 2018 22:42:29 +0200 Subject: [PATCH] Fix sed (#334) --- samba/CHANGELOG.md | 3 +++ samba/config.json | 2 +- samba/run.sh | 24 ++++++++++++------------ 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/samba/CHANGELOG.md b/samba/CHANGELOG.md index daeb7fc..6d3b8d7 100644 --- a/samba/CHANGELOG.md +++ b/samba/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +## 4.1 +- Bugfix sed command + ## 4.0 - New option `allow_hosts` to limit access diff --git a/samba/config.json b/samba/config.json index f1613e1..230cd7b 100644 --- a/samba/config.json +++ b/samba/config.json @@ -1,6 +1,6 @@ { "name": "Samba share", - "version": "4.0", + "version": "4.1", "slug": "samba", "description": "Expose Hass.io folders with SMB/CIFS", "url": "https://home-assistant.io/addons/samba/", diff --git a/samba/run.sh b/samba/run.sh index 3df7ceb..4b24303 100644 --- a/samba/run.sh +++ b/samba/run.sh @@ -33,10 +33,10 @@ function write_config() { " >> /etc/smb.conf } -sed -i "s/%%WORKGROUP%%/$WORKGROUP/g" /etc/smb.conf -sed -i "s/%%NAME%%/$NAME/g" /etc/smb.conf -sed -i "s/%%INTERFACE%%/$INTERFACE/g" /etc/smb.conf -sed -i "s/%%ALLOW_HOSTS%%/$ALLOW_HOSTS/g" /etc/smb.conf +sed -i "s|%%WORKGROUP%%|$WORKGROUP|g" /etc/smb.conf +sed -i "s|%%NAME%%|$NAME|g" /etc/smb.conf +sed -i "s|%%INTERFACE%%|$INTERFACE|g" /etc/smb.conf +sed -i "s|%%ALLOW_HOSTS%%|$ALLOW_HOSTS|g" /etc/smb.conf ## # Write shares to config @@ -59,15 +59,15 @@ fi ## # Set authentication options if [ "$GUEST" == "true" ]; then - sed -i "s/#guest ok/guest ok/g" /etc/smb.conf - sed -i "s/#guest only/guest only/g" /etc/smb.conf - sed -i "s/#guest account/guest account/g" /etc/smb.conf - sed -i "s/#map to guest/map to guest/g" /etc/smb.conf - sed -i "s/#public/public/g" /etc/smb.conf + sed -i "s|#guest ok|guest ok|g" /etc/smb.conf + sed -i "s|#guest only|guest only|g" /etc/smb.conf + sed -i "s|#guest account|guest account|g" /etc/smb.conf + sed -i "s|#map to guest|map to guest|g" /etc/smb.conf + sed -i "s|#public|public|g" /etc/smb.conf else - sed -i "s/#valid users/valid users/g" /etc/smb.conf - sed -i "s/#force user/force user/g" /etc/smb.conf - sed -i "s/#force group/force group/g" /etc/smb.conf + sed -i "s|#valid users|valid users|g" /etc/smb.conf + sed -i "s|#force user|force user|g" /etc/smb.conf + sed -i "s|#force group|force group|g" /etc/smb.conf addgroup -g 1000 "$USERNAME" adduser -D -H -G "$USERNAME" -s /bin/false -u 1000 "$USERNAME"