README.md and samba.sh derp use browsable instead of browse and browseable

This commit is contained in:
David Personette 2016-01-12 05:15:47 -05:00
parent 885ad90331
commit fc6e9a082f
2 changed files with 7 additions and 7 deletions

View File

@ -32,12 +32,12 @@ OR set local storage:
-h This help -h This help
-i "<path>" Import smbpassword -i "<path>" Import smbpassword
required arg: "<path>" - full file path in container to import required arg: "<path>" - full file path in container to import
-s "<name;/path>[;browse;readonly;guest;users]" Configure a share -s "<name;/path>[;browsable;readonly;guest;users]" Configure a share
required arg: "<name>;<comment>;</path>" required arg: "<name>;<comment>;</path>"
<name> is how it's called for clients <name> is how it's called for clients
<path> path to share <path> path to share
NOTE: for the default values, just leave blank NOTE: for the default values, just leave blank
[browseable] default:'yes' or 'no' [browsable] default:'yes' or 'no'
[readonly] default:'yes' or 'no' [readonly] default:'yes' or 'no'
[guest] allowed default:'yes' or 'no' [guest] allowed default:'yes' or 'no'
[users] allowed default:'all' or list of allowed users [users] allowed default:'all' or list of allowed users

View File

@ -33,19 +33,19 @@ import() { local name id file="${1}"
# Arguments: # Arguments:
# share) share name # share) share name
# path) path to share # path) path to share
# browseable) 'yes' or 'no' # browsable) 'yes' or 'no'
# readonly) 'yes' or 'no' # readonly) 'yes' or 'no'
# guest) 'yes' or 'no' # guest) 'yes' or 'no'
# users) list of allowed users # users) list of allowed users
# admins) list of admin users # admins) list of admin users
# Return: result # Return: result
share() { local share="$1" path="$2" browse=${3:-yes} ro=${4:-yes} \ share() { local share="$1" path="$2" browsable=${3:-yes} ro=${4:-yes} \
guest=${5:-yes} users=${6:-""} admins=${7:-""} \ guest=${5:-yes} users=${6:-""} admins=${7:-""} \
file=/etc/samba/smb.conf file=/etc/samba/smb.conf
sed -i "/\\[$share\\]/,/^\$/d" $file sed -i "/\\[$share\\]/,/^\$/d" $file
echo "[$share]" >>$file echo "[$share]" >>$file
echo " path = $path" >>$file echo " path = $path" >>$file
echo " browseable = $browse" >>$file echo " browsable = $browsable" >>$file
echo " read only = $ro" >>$file echo " read only = $ro" >>$file
echo " guest ok = $guest" >>$file echo " guest ok = $guest" >>$file
[[ ${users:-""} && ! ${users:-""} =~ all ]] && [[ ${users:-""} && ! ${users:-""} =~ all ]] &&
@ -92,12 +92,12 @@ Options (fields in '[]' are optional, '<>' are required):
-h This help -h This help
-i \"<path>\" Import smbpassword -i \"<path>\" Import smbpassword
required arg: \"<path>\" - full file path in container to import required arg: \"<path>\" - full file path in container to import
-s \"<name;/path>[;browse;readonly;guest;users]\" Configure a share -s \"<name;/path>[;browsable;readonly;guest;users]\" Configure a share
required arg: \"<name>;<comment>;</path>\" required arg: \"<name>;<comment>;</path>\"
<name> is how it's called for clients <name> is how it's called for clients
<path> path to share <path> path to share
NOTE: for the default value, just leave blank NOTE: for the default value, just leave blank
[browseable] default:'yes' or 'no' [browsable] default:'yes' or 'no'
[readonly] default:'yes' or 'no' [readonly] default:'yes' or 'no'
[guest] allowed default:'yes' or 'no' [guest] allowed default:'yes' or 'no'
[users] allowed default:'all' or list of allowed users [users] allowed default:'all' or list of allowed users