Merge pull request #2409 from MilhouseVH/le90_samba_ebeneezer_goode

samba: use documented browseable/writeable properties not synonyms
LibreELEC · Jan 12, 2018 · c76dba0 · c76dba0
2 parents 883f1ba + 3e06317
commit c76dba0
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 31 deletions.
diff --git a/packages/network/samba/config/smb.conf b/packages/network/samba/config/smb.conf
@@ -60,117 +60,117 @@
   allocation roundup size = 0
 
 # Using the following configurations as a template allows you to add
-# writable shares of disks and paths under /storage
+# writeable shares of disks and paths under /storage
 
 [Update]
   path = /storage/.update
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/.update
 
 [Videos]
   path = /storage/videos
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/videos
 
 [Music]
   path = /storage/music
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/music
 
 [TV Shows]
   path = /storage/tvshows
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/tvshows
 
 [Recordings]
   path = /storage/recordings
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/recordings
 
 [Downloads]
   path = /storage/downloads
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/downloads
 
 [Pictures]
   path = /storage/pictures
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/pictures
 
 [Emulators]
   path = /storage/emulators
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/emulators
 
 [Configfiles]
   path = /storage/.config
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/.config
 
 [Userdata]
   path = /storage/.kodi/userdata
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/.kodi/userdata
 
 [Screenshots]
   path = /storage/screenshots
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/screenshots
 
 [Logfiles]
   path = /storage/logfiles
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/logfiles
   root preexec = createlog
 
 [Backup]
   path = /storage/backup
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/backup
 
 [Picons]
   path = /storage/picons
   available = yes
-  browsable = yes
+  browseable = yes
   public = yes
-  writable = yes
+  writeable = yes
   root preexec = mkdir -p /storage/picons/tvh /storage/picons/vdr
diff --git a/packages/network/samba/scripts/smbd-config b/packages/network/samba/scripts/smbd-config
@@ -30,19 +30,22 @@ SAMBA_MAXPROTOCOL=SMB3
 
 . /storage/.cache/services/samba.conf
 
+# fixup synonyms
+sed -i 's/browsable/browseable/g; s/writable/writeable/g' $SMB_CONF
+
 # handle external drives
 if [ "$SAMBA_AUTOSHARE" == "true" ] ; then
   for dir in /media/* ; do
     if [ -d "$dir" ] ; then
       name=$(basename "$dir")
-      echo -e "[$name]\n  path = $dir\n  available = yes\n  browsable = yes\n  public = yes\n  writable = yes\n" >> $SMB_CONF
+      echo -e "[$name]\n  path = $dir\n  available = yes\n  browseable = yes\n  public = yes\n  writeable = yes\n" >> $SMB_CONF
     fi
   done
 fi
 
 # Allow access to a "failed" (safe mode) Kodi installation
 if [ -d /storage/.kodi.FAILED ]; then
-  echo -e "[Kodi-Failed]\n  path = /storage/.kodi.FAILED\n  available = yes\n  browsable = yes\n  public = yes\n  writable = yes\n" >> $SMB_CONF
+  echo -e "[Kodi-Failed]\n  path = /storage/.kodi.FAILED\n  available = yes\n  browseable = yes\n  public = yes\n  writeable = yes\n" >> $SMB_CONF
 fi
 
 ADD_CONFIG=