Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package aaa_base for openSUSE:Factory
checked in at 2023-09-08 21:15:25
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/aaa_base (Old)
and /work/SRC/openSUSE:Factory/.aaa_base.new.1766 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "aaa_base"
Fri Sep 8 21:15:25 2023 rev:493 rq:1104001 version:84.87+git20230815.cab7b44
Changes:
--------
--- /work/SRC/openSUSE:Factory/aaa_base/aaa_base.changes 2023-04-03
17:45:18.769219464 +0200
+++ /work/SRC/openSUSE:Factory/.aaa_base.new.1766/aaa_base.changes
2023-09-08 21:16:12.579904383 +0200
@@ -1,0 +2,14 @@
+Tue Aug 15 08:35:38 UTC 2023 - lnus...@suse.com
+
+- Update to version 84.87+git20230815.cab7b44:
+ * Remove broken autocompletion overrides and restore default bash behavior
+ * Add foot to DIR_COLORS
+ * files/u/s/sysconf_addword: avoid bashism, fix shellcheck warnings
+ * files/u/s/smart_agetty: replace shebang with /bin/sh
+ * files/u/s/service: avoid bashism, fix shellcheck warnings
+ * files/u/s/refresh_initrd: make POSIX compliant
+ * files/u/b/safe-rm: make POSIX compliant
+ * aaa_base.post: replace shebang with /usr/sh
+ * files/u/b/old: make POSIX compliant
+
+-------------------------------------------------------------------
Old:
----
aaa_base-84.87+git20230329.b39efbc.tar
New:
----
aaa_base-84.87+git20230815.cab7b44.tar
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ aaa_base.spec ++++++
--- /var/tmp/diff_new_pack.EfkVlT/_old 2023-09-08 21:16:14.023955992 +0200
+++ /var/tmp/diff_new_pack.EfkVlT/_new 2023-09-08 21:16:14.023955992 +0200
@@ -33,7 +33,7 @@
%endif
Name: aaa_base
-Version: 84.87+git20230329.b39efbc%{git_version}
+Version: 84.87+git20230815.cab7b44%{git_version}
Release: 0
Summary: openSUSE Base Package
License: GPL-2.0-or-later
@@ -229,7 +229,6 @@
/etc/skel/.emacs
/etc/skel/.inputrc
%dir /usr/lib/base-scripts
-/usr/etc/profile.d/complete.bash
/usr/lib/base-scripts/backup-rpmdb
/usr/lib/base-scripts/backup-sysconfig
/usr/lib/base-scripts/check-battery
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.EfkVlT/_old 2023-09-08 21:16:14.079957994 +0200
+++ /var/tmp/diff_new_pack.EfkVlT/_new 2023-09-08 21:16:14.083958137 +0200
@@ -1,7 +1,7 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/aaa_base.git</param>
- <param
name="changesrevision">b39efbc009fa82640ec066d714949ba2909a228f</param></service><service
name="tar_scm">
+ <param
name="changesrevision">cab7b44076ce52124cfaf556f2e3f17be6ff3802</param></service><service
name="tar_scm">
<param
name="url">https://github.com/lnussel/aaa_base.git</param>
<param
name="changesrevision">0f8eaba2cf2e69db15cce8a4dcf005b6e88f61e6</param></service></servicedata>
(No newline at EOF)
++++++ aaa_base-84.87+git20230329.b39efbc.tar ->
aaa_base-84.87+git20230815.cab7b44.tar ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base-84.87+git20230329.b39efbc/aaa_base.post
new/aaa_base-84.87+git20230815.cab7b44/aaa_base.post
--- old/aaa_base-84.87+git20230329.b39efbc/aaa_base.post 2023-03-29
10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/aaa_base.post 2023-08-15
10:27:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
#
# post.sh - to be done after extraction
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base-84.87+git20230329.b39efbc/aaa_base.spec
new/aaa_base-84.87+git20230815.cab7b44/aaa_base.spec
--- old/aaa_base-84.87+git20230329.b39efbc/aaa_base.spec 2023-03-29
10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/aaa_base.spec 2023-08-15
10:27:48.000000000 +0200
@@ -229,7 +229,6 @@
/etc/skel/.emacs
/etc/skel/.inputrc
%dir /usr/lib/base-scripts
-/usr/etc/profile.d/complete.bash
/usr/lib/base-scripts/backup-rpmdb
/usr/lib/base-scripts/backup-sysconfig
/usr/lib/base-scripts/check-battery
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/aaa_base-84.87+git20230329.b39efbc/files/usr/bin/old
new/aaa_base-84.87+git20230815.cab7b44/files/usr/bin/old
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/bin/old 2023-03-29
10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/bin/old 2023-08-15
10:27:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# This script simply renames files or directories to <name>-<date>[<num>]
@@ -32,19 +32,19 @@
exit
fi
-DATESTRING=`date +"%Y%m%d"`
+DATESTRING=$(date +"%Y%m%d")
for i in "$@" ; do
- i=${i%%/}
+ i=$(echo "$i" | sed 's/\/$//')
if [ -e "$i" ] ; then
NEWNAME=$i-$DATESTRING
NUMBER=0
while [ -e "$NEWNAME" ] ; do
NEWNAME=$i-$DATESTRING-$NUMBER
- let NUMBER=$NUMBER+1
+ NUMBER=$(expr $NUMBER + 1)
done
echo moving "$i" to "$NEWNAME"
- if [ "${i:0:1}" = "-" ] ; then
+ if [ "$(echo $i | cut -c 1)" = "-" ] ; then
i="./$i"
NEWNAME="./$NEWNAME"
fi
@@ -53,4 +53,3 @@
echo "$i" does not exist.
fi
done
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/bin/safe-rm
new/aaa_base-84.87+git20230815.cab7b44/files/usr/bin/safe-rm
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/bin/safe-rm
2023-03-29 10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/bin/safe-rm
2023-08-15 10:27:48.000000000 +0200
@@ -1,24 +1,23 @@
-#!/bin/bash
+#!/bin/sh
todo=
opts=
-case "${0##*/}" in
+case "$(basename "$0")" in
safe-rm) todo=rm ; opts=-f ;;
safe-rmdir) todo=rmdir ; opts= ;;
esac
-set -o physical
test -n "$todo" || exit 2
test -x /bin/$todo || exit 2
test -x /bin/pwd || exit 2
for d; do
- if [[ "$d" != /* ]] ; then
+ if ! echo "$d" | grep -q "^/" ; then
echo "usage: $0 _absolute_path_to_file" 1>&2
exit 1
fi
- path=${d//\/.\//\/}
- name=${path##*/}
+ path=$(echo "$d" | sed 's/\/\.\//\//g')
+ name=$(basename "$path")
if test "/$name" = "$path" ; then
echo "$0: usage in root directory not allowed" 1>&2
@@ -33,7 +32,7 @@
if cd -P "${path}" && test "${path}" = "$(pwd -P)" ; then
- if test "$PWD" = "$(/bin/pwd)" ; then
+ if test "$(pwd -P)" = "$(/bin/pwd)" ; then
/bin/$todo $opts -- "$name"
else
echo "$0: no symlinks allowed in the path of $d" 1>&2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/etc/DIR_COLORS
new/aaa_base-84.87+git20230815.cab7b44/files/usr/etc/DIR_COLORS
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/etc/DIR_COLORS
2023-03-29 10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/etc/DIR_COLORS
2023-08-15 10:27:48.000000000 +0200
@@ -34,6 +34,7 @@
TERM dtterm
TERM Eterm
TERM eterm-color
+TERM foot
TERM gnome
TERM gnome-256color
TERM iterm
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/etc/profile.d/complete.bash
new/aaa_base-84.87+git20230815.cab7b44/files/usr/etc/profile.d/complete.bash
---
old/aaa_base-84.87+git20230329.b39efbc/files/usr/etc/profile.d/complete.bash
2023-03-29 10:16:51.000000000 +0200
+++
new/aaa_base-84.87+git20230815.cab7b44/files/usr/etc/profile.d/complete.bash
1970-01-01 01:00:00.000000000 +0100
@@ -1,694 +0,0 @@
-# /etc/profile.d/complete.bash for SUSE Linux and openSUSE
-#
-#
-# This feature has its own file because some other shells
-# do not like the way how the bash assigns arrays
-#
-# REQUIRES bash 4.2 and higher
-#
-
- _def="-o default -o bashdefault"
- _dir="-o nospace -o dirnames -o plusdirs"
-_file="-o nospace -o filenames"
-_mkdr="-o nospace -o dirnames"
-_nosp="-o nospace"
-
-# Escape file and directory names, add slash to directories if needed.
-# Escaping could be done by the option 'filenames' but this fails
-# e.g. on variable expansion like $HO<TAB>
-_compreply_ ()
-{
- local IFS=$'\n'
- local s x
- local -i o
- local -i isdir=$1
-
- test ${#COMPREPLY[@]} -eq 0 && return 0
-
- #
- # Append a slash on the real result, avoid annoying double tab
- #
- for ((o=0; o < ${#COMPREPLY[@]}; o++)) ; do
- if test ! -d "${COMPREPLY[$o]}" ; then
- ((isdir == 0)) || continue
- COMPREPLY[$o]="${COMPREPLY[$o]%%/}"
- continue
- fi
- COMPREPLY[$o]="${COMPREPLY[$o]%%/}/"
- done
-
- #
- # If we have only one entry, and it's a file-system object, but not
- # a directory, then indicate this by letting readline put a space behind
- # it.
- #
- if test ${#COMPREPLY[@]} -eq 1 ; then
- eval x="${COMPREPLY[@]}"
- if test -d "$x"
- then
- compopt -o plusdirs
- compopt +o nospace
- else
- compopt -o nospace
- fi
- fi
-
- #
- # Escape spaces and braces in path names with `\'
- #
- s="${COMP_WORDBREAKS//[: ]}"
- s="${s// }"
- s="${s//[\{\}()\[\]]}"
- s="${s} (){}[]\`\$"
- o=${#s}
-
- while test $((o--)) -gt 0 ; do
- x="${s:${o}:1}"
- case "$x" in
- \() COMPREPLY=($(echo "${COMPREPLY[*]}"|command sed -r 's/\(/\\\(/g'))
;;
- *) COMPREPLY=(${COMPREPLY[*]//${x}/\\${x}}) ;;
- esac
- done
-}
-
-#
-# Handle the CDPATH variable
-#
-_cdpath_ ()
-{
- local -i o
- local c="$1"
- local x="$(bind -v | sed -rn 's/set (mark-)/\1/p')"
- local dir=$([[ $x =~ mark-directories+([[:space:]])on ]] && echo on)
- local sym=$([[ $x =~ mark-symlinked-directories+([[:space:]])on ]] && echo
on)
-
- for x in ${CDPATH//:/$'\n'}; do
- o=${#COMPREPLY[@]}
- for s in $(compgen -d +o plusdirs $x/$c); do
- if [[ (($sym == on && -h $s) || ($dir == on && ! -h $s)) && ! -d
${s#$x/} ]] ; then
- s="${s}/"
- fi
- COMPREPLY[o++]=${s#$x/}
- done
- done
-}
-
-# Expanding shell function for directories
-_cd_ ()
-{
- local c=${COMP_WORDS[COMP_CWORD]}
- local s x
- local IFS=$'\n'
- local -i glob=0
- local -i isdir=0
- local -i cdpath=0
- local -i quoted=0
-
- if [[ "${c:0:1}" == '"' ]] ; then
- let quoted++
- compopt -o plusdirs
- fi
-
- shopt -q extglob && let glob++
- ((glob == 0)) && shopt -s extglob
-
- if [[ $COMP_WORDBREAKS =~ : && $COMP_LINE =~ : ]] ; then
- # Do not use plusdirs as there is a colon in the directory
- # name(s) which will not work even if escaped with backslash.
- compopt +o plusdirs
- # Restore last argument without breaking at colon
- if ((COMP_CWORD > 1)) ; then
- IFS="${COMP_WORDBREAKS//:}"
- COMP_WORDS=($COMP_LINE)
- let COMP_CWORD=${#COMP_WORDS[@]}-1
- c=${COMP_WORDS[COMP_CWORD]}
- IFS=$'\n'
- fi
- fi
-
- case "${1##*/}" in
- mkdir) ;;
- cd|pushd)
- s="-S/"
- [[ "$c" =~ ^\..* ]] || let cdpath++ ;;
- *) s="-S/"
- esac
-
- case "$c" in
- *[*?[]*) COMPREPLY=() # use bashdefault
- ((cdpath == 0)) || _cdpath_ "$c"
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- \$\(*\)) eval COMPREPLY=\(${c}\)
- compopt +o plusdirs ;;
- \$\(*) COMPREPLY=($(compgen -c -P '$(' -S ')' -- ${c#??}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- \`*\`) eval COMPREPLY=\(${c}\)
- compopt +o plusdirs ;;
- \`*) COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- \$\{*\}) eval COMPREPLY=\(${c}\) ;;
- \$\{*) COMPREPLY=($(compgen -v -P '${' -S '}' -- ${c#??}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- if ((${#COMPREPLY[@]} > 1)) ; then
- ((cdpath == 0)) || _cdpath_ "$c"
- ((glob == 0)) && shopt -u extglob
- return 0
- fi
- let isdir++
- eval COMPREPLY=\(${COMPREPLY[@]}\)
- fi ;;
- \$*) COMPREPLY=($(compgen -v -P '$' $s -- ${c#?}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- if ((${#COMPREPLY[@]} > 1)) ; then
- ((cdpath == 0)) || _cdpath_ "$c"
- ((glob == 0)) && shopt -u extglob
- return 0
- fi
- let isdir++
- eval COMPREPLY=\(${COMPREPLY[@]}\)
- fi ;;
- \~*/*) COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}"))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- \~*) COMPREPLY=($(compgen -u $s -- "${c}"))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- *\:*) if [[ $COMP_WORDBREAKS =~ : ]] ; then
- x=${c%"${c##*[^\\]:}"}
- COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}"))
- COMPREPLY=(${COMPREPLY[@]#"$x"})
- ((${#COMPREPLY[@]} == 0)) || let isdir++
- fi
- ((cdpath == 0)) || _cdpath_ "$c"
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- *) COMPREPLY=() # use (bash)default
- ((cdpath == 0)) || _cdpath_ "$c"
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
- if test ${#COMPREPLY[@]} -gt 0 ; then
- _cdpath_ "$c"
- ((${#COMPREPLY[@]} == 0)) || let isdir++
- fi
-
- ((quoted)) || _compreply_ $isdir
-
- ((glob == 0)) && shopt -u extglob
- return 0
-}
-
-if shopt -q cdable_vars; then
- complete ${_def} ${_dir} -vF _cd_ cd
-else
- complete ${_def} ${_dir} -F _cd_ cd
-fi
-complete ${_def} ${_dir} -F _cd_ rmdir pushd chroot chrootx
-complete ${_def} ${_mkdr} -F _cd_ mkdir
-
-# General expanding shell function
-_exp_ ()
-{
- # bash `complete' is broken because you can not combine
- # -d, -f, and -X pattern without missing directories.
- local c=${COMP_WORDS[COMP_CWORD]}
- local a="${COMP_LINE}"
- local e s cd dc t=""
- local -i o
- local -i glob=0
- local -i quoted=0
- local IFS
-
- if [[ "${c:0:1}" == '"' ]] ; then
- let quoted++
- compopt -o plusdirs
- fi
-
- shopt -q extglob && let glob++
- ((glob == 0)) && shopt -s extglob
-
- # Don't be fooled by the bash parser if extglob is off by default
- cd='*-?(c)d*'
- dc='*-d?(c)*'
-
- case "${1##*/}" in
- compress) e='*.Z' ;;
- bzip2)
- case "$c" in
- -) COMPREPLY=(d c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- -?|-??) COMPREPLY=($c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
- case "$a" in
- $cd|$dc) e='!*.+(*)'
- t='@(bzip2 compressed)*' ;;
- *) e='*.bz2' ;;
- esac ;;
- bunzip2) e='!*.+(*)'
- t='@(bzip2 compressed)*' ;;
- gzip)
- case "$c" in
- -) COMPREPLY=(d c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- -?|-??) COMPREPLY=($c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
- case "$a" in
- $cd|$dc) e='!*.+(*)'
- t='@(gzip compressed|*data 16 bits)*' ;;
- *) e='*.+(gz|tgz|z|Z)' ;;
- esac ;;
- gunzip) e='!*.+(*)'
- t='@(gzip compressed|*data 16 bits)*' ;;
-
- lzma)
- case "$c" in
- -) COMPREPLY=(d c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- -?|-??) COMPREPLY=($c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
- case "$a" in
- $cd|$dc) e='!*.+(lzma)' ;;
- *) e='*.+(lzma)' ;;
- esac ;;
- unlzma) e='!*.+(lzma)' ;;
- xz)
- case "$c" in
- -) COMPREPLY=(d c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- -?|-??) COMPREPLY=($c)
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
- case "$a" in
- $cd|$dc) e='!*.+(xz)' ;;
- *) e='*.+(xz)' ;;
- esac ;;
- unxz) e='!*.+(xz)' ;;
- uncompress) e='!*.Z' ;;
- unzip) e='!*.+(*)'
- t="@(MS-DOS executable|Zip archive)*" ;;
- gs|ghostview) e='!*.+(eps|EPS|ps|PS|pdf|PDF)' ;;
- gv|kghostview) e='!*.+(eps|EPS|ps|PS|ps.gz|pdf|PDF)' ;;
- acroread|[xk]pdf) e='!*.+(fdf|pdf|FDF|PDF)' ;;
- evince) e='!*.+(ps|PS|pdf|PDF)' ;;
- dvips) e='!*.+(dvi|DVI)' ;;
- rpm|zypper) e='!*.+(rpm|you)' ;;
- [xk]dvi) e='!*.+(dvi|dvi.gz|DVI|DVI.gz)' ;;
- tex|latex|pdflatex) e='!*.+(tex|TEX|texi|latex)' ;;
- export)
- case "$a" in
- *=*) c=${c#*=} ;;
- *) COMPREPLY=($(compgen -v -- ${c}))
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
- ;;
- *) e='!*'
- esac
-
- case "$(complete -p ${1##*/} 2> /dev/null)" in
- *-d*) ;;
- *) s="-S/"
- esac
-
- IFS=$'\n'
- case "$c" in
- \$\(*\)) eval COMPREPLY=\(${c}\) ;;
- \$\(*) COMPREPLY=($(compgen -c -P '$(' -S ')' -- ${c#??}))
;;
- \`*\`) eval COMPREPLY=\(${c}\) ;;
- \`*) COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?}))
;;
- \$\{*\}) eval COMPREPLY=\(${c}\) ;;
- \$\{*) COMPREPLY=($(compgen -v -P '${' -S '}' -- ${c#??}))
;;
- \$*) COMPREPLY=($(compgen -v -P '$' -- ${c#?}))
;;
- \~*/*) COMPREPLY=($(compgen -f -X "$e" +o plusdirs -- ${c}))
;;
- \~*) COMPREPLY=($(compgen -u ${s} -- ${c}))
;;
- *@*) COMPREPLY=($(compgen -A hostname -P '@' -S ':' --
${c#*@})) ;;
- *[*?[]*) COMPREPLY=() # use bashdefault
- ((glob == 0)) && shopt -u extglob
- return 0
;;
- *[?*+\!@]\(*\)*)
- if ((glob == 0)) ; then
- COMPREPLY=($(compgen -f -X "$e" -- $c))
- ((glob == 0)) && shopt -u extglob
- return 0
- fi
- COMPREPLY=($(compgen -G "${c}"))
;;
- *)
- if test "$c" = ".." ; then
- COMPREPLY=($(compgen -d -X "$e" ${_nosp} +o plusdirs --
$c))
- else
- COMPREPLY=($(compgen -f -X "$e" +o plusdirs -- $c))
- fi
- esac
-
- if test -n "$t" ; then
- let o=0
- local -a reply=()
- ((quoted)) || _compreply_
- for s in ${COMPREPLY[@]}; do
- e=$(eval echo $s)
- if test -d "$e" ; then
- reply[$((o++))]="$s"
- continue
- fi
- case "$(file -b $e 2> /dev/null)" in
- $t) reply[$((o++))]="$s"
- esac
- done
- COMPREPLY=(${reply[@]})
- ((glob == 0)) && shopt -u extglob
- return 0
- fi
-
- ((quoted)) || _compreply_
-
- ((glob == 0)) && shopt -u extglob
- return 0
-}
-
-_gdb_ ()
-{
- local c=${COMP_WORDS[COMP_CWORD]}
- local e p
- local -i o
- local IFS
- local -i quoted=0
-
- if [[ "${c:0:1}" == '"' ]] ; then
- let quoted++
- compopt -o plusdirs
- fi
-
- if test $COMP_CWORD -eq 1 ; then
- case "$c" in
- -*) COMPREPLY=($(compgen -W '-args -tty -s -e -se -c -x -d' -- "$c")) ;;
- *) COMPREPLY=($(compgen -c -- "$c"))
- esac
- return 0
- fi
-
- p=${COMP_WORDS[COMP_CWORD-1]}
- IFS=$'\n'
- case "$p" in
- -args) COMPREPLY=($(compgen -c -- "$c")) ;;
- -tty) COMPREPLY=(/dev/tty* /dev/pts/*)
- COMPREPLY=($(compgen -W "${COMPREPLY[*]}" -- "$c")) ;;
- -s|e|-se) COMPREPLY=($(compgen -f -- "$c")) ;;
- -c|-x) COMPREPLY=($(compgen -f -- "$c")) ;;
- -d) COMPREPLY=($(compgen -d ${_nosp} +o plusdirs -- "$c"))
;;
- *)
- if test -z "$c"; then
- COMPREPLY=($(command ps axho comm,pid |\
- command sed -rn "\@^${p##*/}@{
s@.*[[:blank:]]+@@p; }"))
- else
- COMPREPLY=()
- fi
- let o=${#COMPREPLY[*]}
- ((quoted)) || _compreply_
- for s in $(compgen -f -- "$c") ; do
- e=$(eval echo $s)
- if test -d "$e" ; then
- COMPREPLY[$((o++))]="$s"
- continue
- fi
- case "$(file -b $e 2> /dev/null)" in
- *) COMPREPLY[$((o++))]="$s"
- esac
- done
- esac
- return 0
-}
-
-complete ${_def} -X '.[^./]*' -F _exp_ ${_file} \
- compress \
- bzip2 \
- bunzip2 \
- gzip \
- gunzip \
- uncompress \
- unzip \
- gs ghostview \
- gv kghostview \
- acroread xpdf kpdf \
- evince rpm zypper \
- dvips xdvi kdvi \
- tex latex pdflatex
-
-complete ${_def} -F _exp_ ${_file} chown chgrp chmod chattr ln
-complete ${_def} -F _exp_ ${_file} more cat less strip grep vi ed
-
-complete ${_def} -A function -A alias -A command -A builtin \
- type
-complete ${_def} -A function function
-complete ${_def} -A alias alias unalias
-complete ${_def} -A variable unset local readonly
-complete ${_def} -F _exp_ ${_nosp} export
-complete ${_def} -A variable -A export unset
-complete ${_def} -A shopt shopt
-complete ${_def} -A setopt set
-complete ${_def} -A helptopic help
-complete ${_def} -A user talk su login sux
-complete ${_def} -A builtin builtin
-complete ${_def} -A export printenv
-complete ${_def} -A command command which nohup exec nice eval
-complete ${_def} -A command ltrace strace
-complete ${_def} -F _gdb_ ${_file} gdb
-HOSTFILE=""
-test -s $HOME/.hosts && HOSTFILE=$HOME/.hosts
-complete ${_def} -A hostname ping telnet slogin rlogin \
- traceroute nslookup
-complete ${_def} -A hostname -A directory -A file \
- rsh ssh scp
-complete ${_def} -A stopped -P '%' bg
-complete ${_def} -A job -P '%' fg jobs disown
-
-# Expanding shell function for manual pager
-_man_ ()
-{
- local c=${COMP_WORDS[COMP_CWORD]}
- local o=${COMP_WORDS[COMP_CWORD-1]}
- local os="- f k P S t l"
- local ol="whatis apropos pager sections troff local-file"
- local m s
-
- if test -n "$MANPATH" ; then
- m=${MANPATH//:/\/man,}
- else
- m="/usr/X11R6/man/man,/usr/openwin/man/man,/usr/share/man/man"
- fi
-
- case "$c" in
- -) COMPREPLY=($os) ;;
- --) COMPREPLY=($ol) ;;
- -?) COMPREPLY=($c) ;;
- \./*)
- COMPREPLY=($(compgen -f -d -X '\./.*' +o plusdirs -- $c)) ;;
- [0-9n]|[0-9n]p)
- COMPREPLY=($c) ;;
- *)
- case "$o" in
- -l|--local-file)
- COMPREPLY=($(compgen -f -d -X '.*' +o plusdirs -- $c)) ;;
- [0-9n]|[0-9n]p)
- s=$(eval echo {${m}}$o/)
- if type -p sed &> /dev/null ; then
- COMPREPLY=(\
- $(command ls -1UA $s 2>/dev/null|\
- command sed -rn
"/^$c/{s@\.[0-9n].*\.gz@@g;s@.*/:@@g;p;}")\
- )
- else
- s=($(ls -1fUA $s 2>/dev/null))
- s=(${s[@]%%.[0-9n]*})
- s=(${s[@]#*/:})
- for m in ${s[@]} ; do
- case "$m" in
- $c*) COMPREPLY=(${COMPREPLY[@]} $m)
- esac
- done
- unset m s
- COMPREPLY=(${COMPREPLY[@]%%.[0-9n]*})
- COMPREPLY=(${COMPREPLY[@]#*/:})
- fi ;;
- *) COMPREPLY=($(compgen -c -- $c)) ;;
- esac
- esac
-}
-
-complete ${_def} -F _man_ ${_file} man
-
-_rootpath_ ()
-{
- local c=${COMP_WORDS[COMP_CWORD]}
- local os="-h -K -k -L -l -V -v -b -E -H -P -S -i -s"
- local ox="-r -p -t -u"
- case "$c" in
- -*) COMPREPLY=($(compgen -W "$os $ox" -- "$c")) ;;
- *) if ((COMP_CWORD <= 1)) ; then
- COMPREPLY=($(PATH=/sbin:/usr/sbin:$PATH:/usr/local/sbin compgen
-c -- "${c}"))
- else
- COMPREPLY=()
- fi
- esac
- if ((${#COMPREPLY[@]} > 0)) ; then
- let o=0
- for s in ${COMPREPLY[@]}; do
- e=$(eval echo $s)
- if test -d "$e" ; then
- compopt -o plusdirs
- break
- fi
- if ! type -p "$e" > /dev/null 2>&1 ; then
- COMPREPLY[$o]=$(PATH=/sbin:/usr/sbin:$PATH:/usr/local/sbin type
-p "$e" 2> /dev/null)
- fi
- let o++
- done
- fi
-}
-
-complete ${_def} -F _rootpath_ sudo
-
-_ls_ ()
-{
- local c=${COMP_WORDS[COMP_CWORD]}
- local IFS=$'\n'
- local s x
- local -i glob=0
- local -i isdir=0
- local -i quoted=0
- local -i variable=0
-
- if [[ "${c:0:1}" == '"' ]] ; then
- let quoted++
- compopt -o plusdirs
- fi
- if [[ "${c:0:1}" == '$' ]] ; then
- let variable++
- compopt -o dirnames +o filenames
- else
- compopt +o dirnames -o filenames
- fi
-
- if test -d "$c" ; then
- compopt -o nospace
- else
- compopt +o nospace
- fi
-
- shopt -q extglob && let glob++
- ((glob == 0)) && shopt -s extglob
-
- case "$c" in
- *[*?[]*) COMPREPLY=() # use bashdefault
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- \$\(*\)) eval COMPREPLY=\(${c}\)
- compopt +o plusdirs ;;
- \$\(*) COMPREPLY=($(compgen -c -P '$(' -S ')' -- ${c#??}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- \`*\`) eval COMPREPLY=\(${c}\)
- compopt +o plusdirs ;;
- \`*) COMPREPLY=($(compgen -c -P '\`' -S '\`' -- ${c#?}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- \$\{*\}) eval COMPREPLY=\(${c}\) ;;
- \$\{*) COMPREPLY=($(compgen -v -P '${' -S '}' -- ${c#??}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- if ((${#COMPREPLY[@]} > 1)) ; then
- ((glob == 0)) && shopt -u extglob
- return 0
- fi
- let isdir++
- eval COMPREPLY=\(${COMPREPLY[@]}\)
- fi ;;
- \$*) COMPREPLY=($(compgen -v -P '$' $s -- ${c#?}))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- if ((${#COMPREPLY[@]} > 1)) ; then
- ((glob == 0)) && shopt -u extglob
- return 0
- fi
- let isdir++
- eval COMPREPLY=\(${COMPREPLY[@]}\)
- fi ;;
- \~*/*) COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}"))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- \~*) COMPREPLY=($(compgen -u $s -- "${c}"))
- if ((${#COMPREPLY[@]} > 0)) ; then
- compopt +o plusdirs
- let isdir++
- fi ;;
- *\:*) if [[ $COMP_WORDBREAKS =~ : ]] ; then
- x=${c%"${c##*[^\\]:}"}
- COMPREPLY=($(compgen -d $s +o plusdirs -- "${c}"))
- COMPREPLY=(${COMPREPLY[@]#"$x"})
- ((${#COMPREPLY[@]} == 0)) || let isdir++
- fi
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- *) COMPREPLY=() # use (bash)default
- ((glob == 0)) && shopt -u extglob
- return 0 ;;
- esac
-
- ((quoted)) || _compreply_ $isdir
-
- ((glob == 0)) && shopt -u extglob
-}
-
-complete ${_def} ${_file} -F _ls_ ls ll la l ls-l lf
-
-unset _def _dir _file _nosp
-
-#
-# info bash 'Command Line Editing' 'Programmable Completion'
-#
-if ! type -t _completion_loader &> /dev/null ; then
- _completion_loader ()
- {
- local dir=/usr/share/bash-completion/completions
- local cmd="${1##*/}"
- local -i init=$(grep -c _init_completion "${dir}/${cmd}" 2>/dev/null)
- if ((init > 0)) && ! type -t _init_completion &> /dev/null ; then
- complete -o default -o bashdefault "${cmd}" &>/dev/null && return
124
- fi
- . "${dir}/${cmd}" &>/dev/null && return 124
- complete -o default -o bashdefault "${cmd}" &>/dev/null && return 124
- }
- complete -D -F _completion_loader
-fi
-
-#
-# End of /etc/profile.d/complete.bash
-#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/refresh_initrd
new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/refresh_initrd
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/refresh_initrd
2023-03-29 10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/refresh_initrd
2023-08-15 10:27:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# Refresh initrd depending on conditions.
# Currently only the change of /etc/sysconfig/clock is
@@ -14,28 +14,36 @@
test /etc/sysconfig/clock -nt $initrd && refresh=yes
test /etc/sysconfig/kernel -nt $initrd && refresh=yes
-while read module ; do
+tmpfile=$(mktemp)
+
+lsinitrd $initrd | grep -E "$modules/.*\.ko" > "$tmpfile"
+
+while IFS= read -r module; do
module=${module##*/}
module=${module%.ko}
- modconfs=$(grep -lE "[[:blank:]]$module[[:blank:]]" /etc/modprobe.d/*)
+ modconfs=$(grep -lE "[[:blank:]]${module}[[:blank:]]" /etc/modprobe.d/*)
for modconf in $modconfs; do
- test $modconf -nt $initrd && refresh=yes
- break 2
+ test $modconf -nt $initrd && refresh=yes
+ break 2
done
-done < <(lsinitrd /boot/initrd | grep -E "$modules/.*\.ko")
+done < "$tmpfile"
+rm "$tmpfile"
unset modules module modconfs modconf
test "$refresh" = yes || exit 0
-/sbin/modprobe dm_mod --quiet &> /dev/null || true
+/sbin/modprobe dm_mod --quiet > /dev/null 2>&1 || true
line=on
test -e /proc/splash && read line < /proc/splash
line=${line##*: }
SPLASH=no
-[[ $line =~ on ]] && SPLASH=yes
+case $line in
+ *on*) SPLASH=yes;;
+esac
test -e /etc/sysconfig/bootsplash && . /etc/sysconfig/bootsplash
test $SPLASH = yes && set -- -s auto
-exec -a mkinitrd /sbin/mkinitrd ${1+"$@"}
+exec /sbin/mkinitrd "${1+"$@"}"
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/service
new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/service
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/service
2023-03-29 10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/service
2023-08-15 10:27:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
#
# /sbin/service Handle boot and runlevel services
#
@@ -35,15 +35,17 @@
LANG=POSIX
export PATH TERM LANG
-typeset -i reloaded=0
+reloaded=0
daemon_reload()
{
local state
- ((reloaded)) && return
+ if [ "$reloaded" -ne 0 ]; then
+ return
+ fi
state=$(systemctl --full --no-legend --no-pager
--property=NeedDaemonReload show "$1" 2>/dev/null)
test "$state" = "NeedDaemonReload=no" && return
systemctl daemon-reload
- let reloaded++
+ reloaded=$((reloaded + 1))
}
is_service()
@@ -69,7 +71,7 @@
exec_rc ()
{
local rc=''
- local -i ret
+ local ret
if sd_booted && test -z "$SYSTEMD_NO_WRAP"; then
if is_systemd_action "$2"; then
if is_service "$1"; then
@@ -176,17 +178,17 @@
args=""
while test $# -gt 0; do
opt=
- if test "${1::1}" = "-"; then
- if test ${#1} -gt 2 -a "${1::2}" = "--" ; then
- opt="${1:2}"
- else
- opt="${1:1}"
- fi
- shift
+ if [ "$(echo "$1" | cut -c1)" = "-" ]; then
+ if [ "$(echo "$1" | cut -c1-2)" = "--" ] && [ "$(echo "$1" | cut -c3-
| wc -c)" -gt 1 ]; then
+ opt="$(echo "$1" | cut -c3-)"
+ else
+ opt="$(echo "$1" | cut -c2-)"
+ fi
+ shift
else
- args="${args:+$args }$1"
- shift
- continue
+ args="${args:+$args }$1"
+ shift
+ continue
fi
case "$opt" in
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/smart_agetty
new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/smart_agetty
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/smart_agetty
2023-03-29 10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/smart_agetty
2023-08-15 10:27:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# emulate: /sbin/agetty -L $speed console for console != vga/framebuffer
console
#echo "$0: called with '$*'" > /dev/kmsg
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/sysconf_addword
new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/sysconf_addword
--- old/aaa_base-84.87+git20230329.b39efbc/files/usr/sbin/sysconf_addword
2023-03-29 10:16:51.000000000 +0200
+++ new/aaa_base-84.87+git20230815.cab7b44/files/usr/sbin/sysconf_addword
2023-08-15 10:27:48.000000000 +0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# Copyright 2005 Peter Poeml <apa...@suse.de>. All Rights Reserved.
@@ -41,7 +41,8 @@
word_present () {
. $file
- case " ${!var} " in
+ var_value="$(eval "echo \${$var}")"
+ case " $var_value " in
*" $word "*) true;;
*) false;;
esac
@@ -102,7 +103,7 @@
file=$1; shift
var=$1; shift
word=$1
-word_quoted=${1//\//\\\/}
+word_quoted=$(echo "$1" | sed 's/\//\\\//g')
if $debug; then
