Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixes #12811: Synchronize the 'slackpkg' cfengine package module shipped with ncf with the official one #783

Merged
merged 1 commit into from
Jun 21, 2018
Merged

Fixes #12811: Synchronize the 'slackpkg' cfengine package module shipped with ncf with the official one #783

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions tree/10_ncf_internals/modules/packages/slackpkg
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ CMD="$1"
DEFARCH=$(uname -m)
REPO=''
INPUTLIST=''
SLACKPKG_CMD_PREFIX="slackpkg -dialog=off -batch=on -default_answer=yes"

fatal() {
echo "ErrorMessage=$*"
Expand All @@ -15,16 +14,16 @@ fatal() {
parse_line() {
INPUTP="$1"

echo "${INPUTP}" | awk -F= '{print "KEYWORD=" $1 "; VALUE=" $2;}' 2>/dev/null
KEYWORD=$(echo "${INPUTP}" | sed -e 's/=.*$//')
VALUE=$(echo "${INPUTP}" | sed -e 's/^.*=//')

unset INPUTP

}

read_options() {
while read -r INPUT ; do
if [ -n "${INPUT}" ] ; then
eval `parse_line "${INPUT}"`
parse_line "${INPUT}"
case "${KEYWORD}" in
File|Name)
VER=''
Expand Down Expand Up @@ -159,22 +158,22 @@ case "${CMD}" in
get_package_data
;;
list-installed)
ls -l /var/log/packages/ |sed -e 's/.* \([^ ]\+\)-\([_a-w0-9.?]\+\)-\(.*\)-.*/Name=\1\'$'\nVersion=\\2\\nArchitecture=\\3/'
ls -1 /var/log/packages/ |sed -e 's/\([^ ]\+\)-\([_a-zA-Z0-9.?]\+\)-\(.*\)-/Name=\1\'$'\nVersion=\\2\\nArchitecture=\\3/'
;;
list-updates-local|list-updates)
${SLACKPKG_CMD_PREFIX} upgrade-all | sed -r 's!^(.+)-(.+)-(i[0-9]86|noarch|x86_64|x86|fw|npmjs)-(.*)$!Name=\1\nVersion=\2\nArchitecture=\3!g' | grep -vE "Total\ package|Do\ you\ wish\ to|Looking\ for|Checking\ local|^$"
slackpkg -dialog=off -batch=on upgrade-all | sed -r 's!^(.+)-(.+)-(i[0-9]86|noarch|x86_64|x86|fw|npmjs)-(.*)$!Name=\1\nVersion=\2\nArchitecture=\3!g' | grep -vE "Total\ package|Do\ you\ wish\ to|Looking\ for|Checking\ local|^$"
;;
repo-install|file-install|remove)
process_inputs "${CMD}" "${INPUTLIST}"
case "${CMD}" in
repo-install)
${SLACKPKG_CMD_PREFIX} install ${PKG} 2>/dev/null >/dev/null
slackpkg -dialog=off -batch=on -default_answer=yes install ${PKG} 2>/dev/null >/dev/null
;;
file-install)
installpkg ${PKG} 2>/dev/null >/dev/null
;;
remove)
${SLACKPKG_CMD_PREFIX} remove ${PKG} 2>/dev/null >/dev/null
slackpkg -dialog=off -batch=on -default_answer=yes remove ${PKG} 2>/dev/null >/dev/null
;;
esac
RC=$?
Expand Down