DRY: Remove default parameter value handeling in __package_pkg_freebsd

flavor, pkgsite and version are expected to be empty.
They're all checked with [ -n "$var" ]
remotes/origin/3.1
Antoine Catton 10 years ago
parent 9fd285da4c
commit f7bf6a058e
  1. 21
      cdist/conf/type/__package_pkg_freebsd/gencode-remote
  2. 0
      cdist/conf/type/__package_pkg_freebsd/parameter/default/flavor
  3. 0
      cdist/conf/type/__package_pkg_freebsd/parameter/default/pkgsite
  4. 1
      cdist/conf/type/__package_pkg_freebsd/parameter/default/state
  5. 0
      cdist/conf/type/__package_pkg_freebsd/parameter/default/version

@ -51,23 +51,10 @@ else
name="$__object_id"
fi
if [ -f "$__object/parameter/flavor" ]; then
flavor="$(cat "$__object/parameter/flavor")"
fi
if [ -f "$__object/parameter/version" ]; then
version="$(cat "$__object/parameter/version")"
fi
if [ -f "$__object/parameter/pkgsite" ]; then
pkgsite="$(cat "$__object/parameter/pkgsite")"
fi
if [ -f "$__object/parameter/state" ]; then
state="$(cat "$__object/parameter/state")"
else
state="present"
fi
flavor="$(cat "$__object/parameter/flavor")"
version="$(cat "$__object/parameter/version")"
pkgsite="$(cat "$__object/parameter/pkgsite")"
state="$(cat "$__object/parameter/state")"
curr_version="$(cat "$__object/explorer/pkg_version")"
add_cmd="pkg_add"
rm_cmd="pkg_delete"

Loading…
Cancel
Save