Include error codes
This commit is contained in:
parent
e281c0a804
commit
f1521a7dbf
|
@ -60,16 +60,16 @@ bakeradd()
|
||||||
esac
|
esac
|
||||||
done
|
done
|
||||||
|
|
||||||
[ -z "$user" ] && die "Need a user"
|
[ -z "$user" ] && die 2 "Need a user"
|
||||||
[ -z "$name" ] && die "Need a name"
|
[ -z "$name" ] && die 2 "Need a name"
|
||||||
[ -z "$keyfile" ] && die "Need a keyfile"
|
[ -z "$keyfile" ] && die 2 "Need a keyfile"
|
||||||
|
|
||||||
log "Adding user $user"
|
log "Adding user $user"
|
||||||
adduser \
|
adduser \
|
||||||
--shell="$shell" \
|
--shell="$shell" \
|
||||||
--gecos="$name" \
|
--gecos="$name" \
|
||||||
--disabled-password "$user" &&
|
--disabled-password "$user" &&
|
||||||
ok
|
ok || die 4 "Couldn't add user \"$user\""
|
||||||
log "Adding user $user to groups $groups"
|
log "Adding user $user to groups $groups"
|
||||||
usermod -a -G "$groups" "$user" && ok
|
usermod -a -G "$groups" "$user" && ok
|
||||||
|
|
||||||
|
@ -87,6 +87,8 @@ bakeradd()
|
||||||
mkdir "/var/gemini/bakers/$user"
|
mkdir "/var/gemini/bakers/$user"
|
||||||
chown "$user:$user" "/var/gemini/bakers/$user"
|
chown "$user:$user" "/var/gemini/bakers/$user"
|
||||||
chmod 755 "/var/gemini/bakers/$user"
|
chmod 755 "/var/gemini/bakers/$user"
|
||||||
|
sudo --user="$user" \
|
||||||
|
ln -s /var/gemini/bakers/$user /home/$user/public_gemini
|
||||||
} && ok
|
} && ok
|
||||||
|
|
||||||
echo "$user added."
|
echo "$user added."
|
||||||
|
@ -144,7 +146,7 @@ bakerdemote()
|
||||||
main()
|
main()
|
||||||
{ # entry point
|
{ # entry point
|
||||||
(( $# == 0 )) && usage 1
|
(( $# == 0 )) && usage 1
|
||||||
cmd="$1"; shift || die "Not enough arguments for \"$cmd\""
|
cmd="$1"; shift || die 2 "Not enough arguments for \"$cmd\""
|
||||||
case "$cmd" in
|
case "$cmd" in
|
||||||
help|h|usage|-h|--help)
|
help|h|usage|-h|--help)
|
||||||
(( $# == 0 )) && usage 0
|
(( $# == 0 )) && usage 0
|
||||||
|
@ -153,7 +155,7 @@ main()
|
||||||
awk "BEGIN{FS=\"\\n\";RS=\"\";}/baker$1/{print}" "$0" |
|
awk "BEGIN{FS=\"\\n\";RS=\"\";}/baker$1/{print}" "$0" |
|
||||||
sed -n 's/# //p'
|
sed -n 's/# //p'
|
||||||
exit
|
exit
|
||||||
} || die "No command \"$1\""
|
} || die 2 "No command \"$1\""
|
||||||
;;
|
;;
|
||||||
add|hire)
|
add|hire)
|
||||||
cmd=add ;;
|
cmd=add ;;
|
||||||
|
@ -165,7 +167,7 @@ main()
|
||||||
cmd=demote ;;
|
cmd=demote ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
(( $(id -u) == 0 )) || die "Script must be run as root"
|
(( $(id -u) == 0 )) || die 3 "Script must be run as root"
|
||||||
"baker$cmd" "$@"
|
"baker$cmd" "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -170,6 +170,8 @@ bread_publish()
|
||||||
groupck admin
|
groupck admin
|
||||||
git -C /bread/site pull
|
git -C /bread/site pull
|
||||||
make -C /bread/site publish
|
make -C /bread/site publish
|
||||||
|
# also publish gemini
|
||||||
|
/bread/update-gemini-index.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
main()
|
main()
|
||||||
|
|
Loading…
Reference in New Issue