diff options
| author | B. Watson <yalhcru@gmail.com> | 2022-04-09 13:59:52 -0400 |
|---|---|---|
| committer | B. Watson <yalhcru@gmail.com> | 2022-04-09 13:59:52 -0400 |
| commit | 1cecbc5f371d4682ec8ebdce1529082eab27aec2 (patch) | |
| tree | efcf54d357a1d8469cb299ffd4feeafdf70414fb /system/csh | |
| parent | 86b050d76068a7cca36e113837384d5a8b7d9b79 (diff) | |
system/csh: Fix doinst.sh.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'system/csh')
| -rw-r--r-- | system/csh/csh.SlackBuild | 6 | ||||
| -rw-r--r-- | system/csh/doinst.sh | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/system/csh/csh.SlackBuild b/system/csh/csh.SlackBuild index d18ab6e437b8e..2cc0858b65b30 100644 --- a/system/csh/csh.SlackBuild +++ b/system/csh/csh.SlackBuild @@ -6,6 +6,10 @@ # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20220409 bkw: BUILD=2 +# - fix doinst.sh: only create bin/csh symlink if bin exists, which +# fixes installing the package with 'installpkg -root /some/path'. + # 20210827 bkw: # - update to latest debian patch (6), add deb version to VERSION. # - add -current fix for recent glibc. @@ -19,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=csh VERSION=${VERSION:-20110502_6} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} diff --git a/system/csh/doinst.sh b/system/csh/doinst.sh index 5dec6bfce4c54..9bd8ee77d8e7b 100644 --- a/system/csh/doinst.sh +++ b/system/csh/doinst.sh @@ -1,19 +1,16 @@ config() { NEW="$1" OLD="$(dirname $NEW)/$(basename $NEW .new)" - # If there's no config file by that name, mv it over: if [ ! -r $OLD ]; then mv $NEW $OLD elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then - # toss the redundant copy rm $NEW fi - # Otherwise, we leave the .new copy for the admin to consider... } config etc/csh.login.new # If there's no csh link, take over: -if [ ! -r bin/csh ]; then +if [ -d bin -a ! -r bin/csh ]; then ( cd bin ; ln -sf ../usr/bin/csh csh ) fi |