diff options
| author | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-14 19:50:18 -0400 |
|---|---|---|
| committer | Daniel Kahn Gillmor <dkg@fifthhorseman.net> | 2008-09-14 19:50:18 -0400 |
| commit | b5e33d44a4a838b8212a156b28b186331e5e4adb (patch) | |
| tree | 1466e580423fdb692541f1891d6fbfca3c0a7b95 /packaging/freebsd | |
| parent | d454019309fb9887f40b2330866f26741b4e8078 (diff) | |
forcing monkeysphere shell to bash for FreeBSD.
Diffstat (limited to 'packaging/freebsd')
| -rw-r--r-- | packaging/freebsd/distinfo | 4 | ||||
| -rwxr-xr-x | packaging/freebsd/pkg-install | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/packaging/freebsd/distinfo b/packaging/freebsd/distinfo index 26aa939..b8ad49b 100644 --- a/packaging/freebsd/distinfo +++ b/packaging/freebsd/distinfo @@ -1,3 +1,3 @@ -MD5 (monkeysphere_0.16~pre.orig.tar.gz) = e94bc8371adf8ce30c58ec040e436417 -SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = f8543778c6ae5a7a87dcb03e34980436f6d967edeb87ccfac2cc19c750f4e588 +MD5 (monkeysphere_0.16~pre.orig.tar.gz) = c5c5211440e31d04df1f7904ec859fb9 +SHA256 (monkeysphere_0.16~pre.orig.tar.gz) = 77faf81cc51dff754ecb7122de26818b908e06ab4e0bdbd0320346dde53612cd SIZE (monkeysphere_0.16~pre.orig.tar.gz) = 59253 diff --git a/packaging/freebsd/pkg-install b/packaging/freebsd/pkg-install index 6783ee8..940b796 100755 --- a/packaging/freebsd/pkg-install +++ b/packaging/freebsd/pkg-install @@ -22,6 +22,7 @@ POST-INSTALL) GROUP=${USER} UID=641 GID=${UID} + SHELL=/usr/local/bin/bash if pw group show "${GROUP}" 2>/dev/null; then echo "You already have a group \"${GROUP}\", so I will use it." @@ -34,8 +35,15 @@ POST-INSTALL) fi fi - if pw user show "${USER}" 2>/dev/null; then - echo "You already have a user \"${USER}\", so I will use it." + if oldshell=`pw user show "${USER}" 2>/dev/null`; then + if [ x"$oldshell" != x"$SHELL" ]; then + echo "You already have a \"${USER}\" user, but its shell is '$oldshell'." + echo "This package requires that \"${USER}\"'s shell be '$SHELL'." + echo "You should fix this by hand and then re-install the package." + echo " hint: pw usermod '$USER' -s '$SHELL'" + exit 1 + fi + echo "You already have a user \"${USER}\" with the proper shell, so I will use it." else if pw useradd ${USER} -u ${UID} -g ${GROUP} -h - \ -d "$VARLIB" -s /usr/local/bin/bash -c "monkeysphere authentication user,,," |