Subversion Repositories pub

Compare Revisions

Ignore whitespace Rev 451 → Rev 452

/video-contact-sheet/branches/1.12.3/pkg/vcs
4066,18 → 4066,25
-U|--fullname)
# -U accepts an optional argument, 0, to make an anonymous signature
# --fullname accepts no argument
if [[ $2 ]]; then # With argument, special handling
if [[ $2 != '0' ]]; then
error "Use '-U0' to make an anonymous contact sheet or '-u \"My Name\"'"
error " to sign as My Name. Got -U$2"
exit $EX_USAGE
if [[ $1 = '-U' ]]; then # -U always provides an argument
if [[ -n $2 ]]; then # With argument, special handling
if [[ $2 != '0' ]]; then
error "Use '-U0' to make an anonymous contact sheet or '-u \"My Name\"'"
error " to sign as My Name. Got -U$2"
exit $EX_USAGE
fi
anonymous_mode=1
fi
anonymous_mode=1
shift
else # No argument, default handling (try to guess real name)
user=$(grep ^$(id -un): /etc/passwd | cut -d':' -f5 |sed 's/,.*//g')
username=$(id -un)
if type -p getent >/dev/null ; then
user=$(getent passwd "$username" | cut -d':' -f5 |sed 's/,.*//g')
else
user=$(grep "^$username:" /etc/passwd | cut -d':' -f5 |sed 's/,.*//g')
fi
if [[ -z $user ]]; then
user=$(id -un)
user=$username
error "No fullname found, falling back to default ($user)"
fi
fi
/video-contact-sheet/branches/1.12.3/pkg/CHANGELOG
1,9 → 1,11
1.12.3:
* BUGFIX: Actually handle --ffmpeg and --mplayer [#169]
* BUGFIX: Correct parsing of -U [#187]
* OTHER:
- Fix printing of remaining options on command-line error
- Switch to a minimum of bash 3.1 [#173]
- Avoid re-capturing the same frame twice [#122]
- Use getent instead of /etc/passwd when available
* INTERNAL:
- Use of Bash's 'caller' in 'assert' and 'trace'
- 'assert' prints a call trace on error