thijso/cdist
1
0
Fork 0
forked from ungleich-public/cdist
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #539 from 4nd3r/__apt_mark

Browse source 
__apt_mark tweaks
This commit is contained in:
Darko Poljak 2017-07-03 21:26:25 +02:00 committed by GitHub
commit 1582661da9
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
cdist/conf/type/__apt_mark/explorer/apt_version Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e
#
# 2016 Ander Punnar (cdist at kvlt.ee)
#
@ -26,6 +26,6 @@ apt_version_is=$(dpkg-query --show --showformat '${Version}' apt)
apt_version_should=0.8.14.2
dpkg --compare-versions $apt_version_should le $apt_version_is \
dpkg --compare-versions "$apt_version_should" le "$apt_version_is" \
&& echo 0 \
|| echo 1

6
cdist/conf/type/__apt_mark/explorer/package_installed Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e
#
# 2016 Ander Punnar (cdist at kvlt.ee)
#
@ -24,7 +24,7 @@ else
name="$__object_id"
fi
dpkg-query --show --showformat '${Status}' $name 2>/dev/null \
| grep -q 'ok installed' \
dpkg-query --show --showformat '${Status}' "$name" 2>/dev/null \
| grep -Fq 'ok installed' \
&& echo 0 \
|| echo 1

4
cdist/conf/type/__apt_mark/explorer/state Normal file → Executable file
View file

@ -1,4 +1,4 @@
#!/bin/sh
#!/bin/sh -e
#
# 2016 Ander Punnar (cdist at kvlt.ee)
#
@ -24,4 +24,4 @@ else
name="$__object_id"
fi
apt-mark showhold | grep -q $name && echo hold || echo unhold
apt-mark showhold | grep -Fq "$name" && echo hold || echo unhold