samba.sh fix #252

dperson · Mar 20, 2020 · f4f12a6 · f4f12a6
1 parent 64db877
commit f4f12a6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -64,7 +64,7 @@ COPY samba.sh /usr/bin/
 EXPOSE 137/udp 138/udp 139 445
 
 HEALTHCHECK --interval=60s --timeout=15s \
- CMD smbclient -L '\\localhost' -U '%' -m SMB3
+ CMD smbclient -L \\localhost -U % -m SMB3
 
 VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
  "/run/samba"]

diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64
@@ -65,7 +65,7 @@ COPY samba.sh /usr/bin/
 EXPOSE 137/udp 138/udp 139 445
 
 HEALTHCHECK --interval=60s --timeout=15s \
- CMD smbclient -L '\\localhost' -U '%' -m SMB3
+ CMD smbclient -L \\localhost -U % -m SMB3
 
 VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
  "/run/samba"]

diff --git a/Dockerfile.armhf b/Dockerfile.armhf
@@ -65,7 +65,7 @@ COPY samba.sh /usr/bin/
 EXPOSE 137/udp 138/udp 139 445
 
 HEALTHCHECK --interval=60s --timeout=15s \
- CMD smbclient -L '\\localhost' -U '%' -m SMB3
+ CMD smbclient -L \\localhost -U % -m SMB3
 
 VOLUME ["/etc", "/var/cache/samba", "/var/lib/samba", "/var/log/samba",\
  "/run/samba"]

diff --git a/samba.sh b/samba.sh
@@ -105,10 +105,12 @@ share() { local share="$1" path="$2" browsable="${3:-yes}" ro="${4:-yes}" \
  echo " browsable = $browsable" >>$file
  echo " read only = $ro" >>$file
  echo " guest ok = $guest" >>$file
- echo -n " veto files = /._*/.apdisk/.AppleDouble/.DS_Store/" >>$file
- echo -n ".TemporaryItems/.Trashes/desktop.ini/ehthumbs.db/" >>$file
- echo "Network Trash Folder/Temporary Items/Thumbs.db/" >>$file
- echo " delete veto files = yes" >>$file
+ [[ $VETO == no ]] || {
+ echo -n " veto files = /._*/.apdisk/.AppleDouble/.DS_Store/" >>$file
+ echo -n ".TemporaryItems/.Trashes/desktop.ini/ehthumbs.db/" >>$file
+ echo "Network Trash Folder/Temporary Items/Thumbs.db/" >>$file
+ echo " delete veto files = yes" >>$file
+ }
  [[ ${users:-""} && ! ${users:-""} == all ]] &&
  echo " valid users = $(tr ',' ' ' <<< $users)" >>$file
  [[ ${admins:-""} && ! ${admins:-""} =~ none ]] &&