pedro/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'fix/type/__update_alternatives/dry-run' into 'master'

Browse source 
update alternatives: fixes for dry runs and non-English systems

See merge request ungleich-public/cdist!1016
This commit is contained in:
poljakowski 2021-08-05 10:23:29 +02:00
commit d37772f3ea
5 changed files with 32 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__update_alternatives/explorer/alternatives
View file

@ -1,4 +1,4 @@
#!/bin/sh -e #!/bin/sh -e
update-alternatives --display "$__object_id" 2>/dev/null \ LC_ALL=C update-alternatives --display "${__object_id:?}" 2>/dev/null \
| awk -F ' - ' '/priority [0-9]+$/ { print $1 }' | awk -F ' - ' '/priority [0-9]+$/ { print $1 }'

11
cdist/conf/type/__update_alternatives/explorer/link
View file

@ -18,12 +18,12 @@ for altdir in \
/var/lib/dpkg/alternatives \ /var/lib/dpkg/alternatives \
/var/lib/alternatives /var/lib/alternatives
do do
if [ ! -f "$altdir/$__object_id" ] if [ ! -f "$altdir/${__object_id:?}" ]
then then
continue continue
fi fi
link="$( awk 'NR==2' "$altdir/$__object_id" )" link="$( awk 'NR==2' "$altdir/${__object_id:?}" )"
if [ -n "$link" ] if [ -n "$link" ]
then then
@ -31,9 +31,12 @@ do
fi fi
done done
if [ -z "$link" ] if [ -z "$link" ] && [ -z "${__cdist_dry_run+dry run}" ]
then then
echo "unable to get link for $__object_id" >&2 # NOTE: ignore error for dry-runs because a package providing the link
# might be managed by another cdist object (which wasn't executed,
# because dry run…).
echo "unable to get link for ${__object_id:?}" >&2
exit 1 exit 1
fi fi

12
cdist/conf/type/__update_alternatives/explorer/path_is
View file

@ -1,11 +1,15 @@
#!/bin/sh -e #!/bin/sh -e
path_is="$( update-alternatives --display "$__object_id" 2>/dev/null \ path_is=$(
| awk '/link currently points to/ {print $5}' )" LC_ALL=C update-alternatives --display "${__object_id?}" 2>/dev/null \
| awk '/link currently points to/ { print $5 }')
if [ -z "$path_is" ] if [ -z "$path_is" ] && [ -z "${__cdist_dry_run+dry run}" ]
then then
echo "unable to get current path for $__object_id" >&2 # NOTE: ignore error for dry-runs because a package providing the
# alternative might be managed by another cdist object (which
# wasn't executed, because dry run…).
echo "unable to get current path for ${__object_id:?}" >&2
exit 1 exit 1
fi fi

2
cdist/conf/type/__update_alternatives/explorer/path_should_state
View file

@ -1,6 +1,6 @@
#!/bin/sh -e #!/bin/sh -e
if [ -f "$( cat "$__object/parameter/path" )" ] if [ -f "$( cat "${__object:?}/parameter/path" )" ]
then then
echo 'present' echo 'present'
else else

26
cdist/conf/type/__update_alternatives/gencode-remote
View file

@ -18,37 +18,39 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>. # along with cdist. If not, see <http://www.gnu.org/licenses/>.
path_is="$( cat "$__object/explorer/path_is" )" path_is="$( cat "${__object:?}/explorer/path_is" )"
path_should="$( cat "$__object/parameter/path" )" path_should="$( cat "${__object:?}/parameter/path" )"
if [ "$path_is" = "$path_should" ] if [ "$path_is" = "$path_should" ]
then then
exit 0 exit 0
fi fi
if [ "$( cat "$__object/explorer/path_should_state" )" = 'absent' ] && [ -z "$__cdist_dry_run" ] if [ "$( cat "${__object:?}/explorer/path_should_state" )" = 'absent' ] \
&& [ -z "${__cdist_dry_run+dry run}" ]
then then
echo "$path_should does not exist in target" >&2 echo "$path_should does not exist in target" >&2
exit 1 exit 1
fi fi
name="$__object_id" name=${__object_id:?}
alternatives="$( cat "$__object/explorer/alternatives" )" if ! grep -Fxq "$path_should" "${__object:?}/explorer/alternatives"
if ! echo "$alternatives" | grep -Fxq "$path_should"
then then
if [ ! -f "$__object/parameter/install" ] if [ -f "${__object:?}/parameter/install" ]
then then
link="$( cat "${__object:?}/explorer/link" )"
echo "update-alternatives --install '$link' '$name' '$path_should' 1000"
elif [ -z "${__cdist_dry_run+dry run}" ]
then
# NOTE: ignore error for dry-runs because a package providing the link
# to be installed might be managed by another cdist object (which
# wasn't executed, because dry run…).
echo "$path_should is not in $name alternatives." >&2 echo "$path_should is not in $name alternatives." >&2
echo 'Please install missing packages or use --install to add path to alternatives.' >&2 echo 'Please install missing packages or use --install to add path to alternatives.' >&2
exit 1 exit 1
fi fi
link="$( cat "$__object/explorer/link" )"
echo "update-alternatives --install '$link' '$name' '$path_should' 1000"
fi fi
echo "update-alternatives --set '$name' '$path_should'" echo "update-alternatives --set '$name' '$path_should'"