diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2023-11-25 19:44:38 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2023-11-25 20:59:35 +0100 |
| commit | d39761cf9b4205e07a9f5f0f3540281299175c12 (patch) | |
| tree | 16e17949ed0a60dd89747f18c00679cd5d3c5f31 /source/a | |
| parent | 616339b7f26fafbbbcfd9f5e6282d1bce89e0f2a (diff) | |
| download | current-d39761cf9b4205e07a9f5f0f3540281299175c12.tar.gz current-d39761cf9b4205e07a9f5f0f3540281299175c12.tar.xz | |
Sat Nov 25 19:44:38 UTC 202320231125194438
a/shadow-4.14.2-x86_64-2.txz: Rebuilt.
adduser: fixed chown syntax to silence warnings. Thanks to Stuart Winter.
l/gi-docgen-2023.3-x86_64-1.txz: Added.
Thanks to Heinz Wiesinger.
l/python-smartypants-2.0.1-x86_64-1.txz: Added.
Needed for gi-docgen. Thanks to Heinz Wiesinger.
l/python-toml-0.10.2-x86_64-1.txz: Added.
Needed for gi-docgen. Thanks to Heinz Wiesinger.
l/python-typogrify-2.0.7-x86_64-1.txz: Added.
Needed for gi-docgen. Thanks to Heinz Wiesinger.
x/xdg-desktop-portal-1.18.2-x86_64-1.txz: Upgraded.
Thanks to 0XBF.
testing/packages/php-8.3.0-x86_64-1.txz: Added.
Diffstat (limited to 'source/a')
| -rw-r--r-- | source/a/shadow/adduser | 10 | ||||
| -rwxr-xr-x | source/a/shadow/shadow.SlackBuild | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/source/a/shadow/adduser b/source/a/shadow/adduser index 49c11f87a..834b34ada 100644 --- a/source/a/shadow/adduser +++ b/source/a/shadow/adduser @@ -1,7 +1,7 @@ #!/bin/bash # # Copyright 1995 Hrvoje Dogan, Croatia. -# Copyright 2002-2004, 2008, 2009, 2010 Stuart Winter, Surrey, England, UK. +# Copyright 2002-2004, 2008, 2009, 2010, 2023 Stuart Winter, Surrey, England, UK. # Copyright 2004, 2008-2010 Slackware Linux, Inc., Concord, CA, USA # Copyright 2012 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. @@ -30,12 +30,14 @@ # Author : Stuart Winter <mozes@slackware.com> # Based on the original Slackware adduser by Hrvoje Dogan # with modifications by Patrick Volkerding -# Version: 1.16 +# Version: 1.18 ########################################################################## # Usage..: adduser [<new_user_name>] ########################################################################## # History # ########### +# v1.18 - 2023-11-25 +# * chown: use new format for supplying user:group. # v1.17 - 2019-04-01 # * Re-invoking input requests when human error causes failure. <ttk> # qv: https://www.linuxquestions.org/questions/slackware-14/adduser-shell-script-error-4175650984/ @@ -329,7 +331,7 @@ while [ ! -z "$needinput" ]; do if [ "$(echo $getyn | grep -i "n")" ]; then unset needinput # You're most likely going to only do this if you have the dir *mounted* for this user's $HOME - getyn="$(get_input " Do you want to chown $LOGIN.$( echo $GID | awk '{print $2}') $HME ? (y/N) ")" + getyn="$(get_input " Do you want to chown ${LOGIN}:$( echo $GID | awk '{print $2}') $HME ? (y/N) ")" if [ "$(echo $getyn | grep -i "y")" ]; then CHOWNHOMEDIR=$HME # set this to the home directory fi @@ -423,7 +425,7 @@ fi # chown the home dir? We can only do this once the useradd has # completed otherwise the user name doesn't exist. if [ ! -z "${CHOWNHOMEDIR}" ]; then - chown "$LOGIN"."$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}" + chown "${LOGIN}":"$( echo $GID | awk '{print $2}')" "${CHOWNHOMEDIR}" fi # Set the finger information diff --git a/source/a/shadow/shadow.SlackBuild b/source/a/shadow/shadow.SlackBuild index bcee8f9ee..3f624a978 100755 --- a/source/a/shadow/shadow.SlackBuild +++ b/source/a/shadow/shadow.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=shadow VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then |