Merge remote-tracking branch 'telmich/master' into issue__object_name-in-type-explorer
This commit is contained in:
commit
57bd7b2fd3
3 changed files with 14 additions and 4 deletions
|
@ -24,6 +24,8 @@
|
|||
|
||||
name="$__object_id"
|
||||
|
||||
os="$(cat "$__global/explorer/os")"
|
||||
|
||||
# We need to shorten options for both usermod and useradd since on some
|
||||
# systems (such as *BSD, Darwin) those commands do not handle GNU style long
|
||||
# options.
|
||||
|
@ -89,7 +91,11 @@ if grep -q "^${name}:" "$__object/explorer/passwd"; then
|
|||
done
|
||||
|
||||
if [ $# -gt 0 ]; then
|
||||
echo usermod "$@" "$name"
|
||||
if [ "$os" = "freebsd" ]; then
|
||||
echo pw usermod "$@" "$name"
|
||||
else
|
||||
echo usermod "$@" "$name"
|
||||
fi
|
||||
else
|
||||
true
|
||||
fi
|
||||
|
@ -99,5 +105,9 @@ else
|
|||
set -- "$@" "$(shorten_property $property)" \'$new_value\'
|
||||
done
|
||||
|
||||
echo useradd "$@" "$name"
|
||||
if [ "$os" = "freebsd" ]; then
|
||||
echo pw useradd "$@" "$name"
|
||||
else
|
||||
echo useradd "$@" "$name"
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -4,7 +4,7 @@ Changelog
|
|||
* Changes are always commented with their author in (braces)
|
||||
* Exception: No braces means author == Nico Schottelius
|
||||
|
||||
2.0.14:
|
||||
2.0.14: 2012-09-07
|
||||
* Bugfix Type: __jail: Use correct variable (Jake Guffey)
|
||||
* Change Type: __jail: Parameter jailbase now optional (Jake Guffey)
|
||||
* Bugfix Type: __user: Use passwd database on FreeBSD (Jake Guffey)
|
||||
|
|
|
@ -29,7 +29,7 @@ try:
|
|||
'cd "%s" && git describe' % here,
|
||||
stderr=devnull, shell=True).decode('utf-8')
|
||||
except:
|
||||
VERSION = "2.0.13"
|
||||
VERSION = "2.0.14"
|
||||
|
||||
BANNER = """
|
||||
.. . .x+=:. s
|
||||
|
|
Loading…
Reference in a new issue