Merge pull request #306 from smortex/freebsd

Add Compatibility with FreeBSD

Author: jordanbreen28

files/pkg.sh

@@ -0,0 +1,23 @@
+# $1 = string literal to feed to pkg-query. include json formatting
+# No error check here because querying the status of uninstalled packages will return non-zero
+# Use the format string to make a json object with status and version
+# This will print nothing to stdout if the package is not installed
+pkg_status() {
+  pkg query "$1" "${name}"
+}
+
+# Determine if newer package is available to mirror the ruby/puppet implementation
+pkg_check_latest() {
+  installed="$(pkg_status '%v')"
+  [ -z "$installed" ] && success '{ "status": "uninstalled", "version": ""}'
+
+  candidate=$(pkg rquery '%v' "$name")
+
+  if [ "$installed" != "$candidate" ]; then
+    cmd_status="{ \"status\":\"installed\", \"version\":\"${installed}\", \"latest\":\"${candidate}\" }"
+  else
+    cmd_status="$(pkg_status '{ "status":"installed", "version":"%v" }')"
+  fi
+
+  success "$cmd_status"
+}

tasks/init.json

@@ -26,7 +26,7 @@
   "implementations": [
     {"name": "init.rb", "requirements": ["puppet-agent"]},
     {"name": "windows.ps1", "requirements": ["powershell"], "input_method": "powershell"},
-    {"name": "linux.sh", "requirements": ["shell"], "input_method": "environment", "files": ["package/files/common.sh", "package/files/apt.sh", "package/files/yum.sh", "package/files/zypper.sh"]}
+    {"name": "linux.sh", "requirements": ["shell"], "input_method": "environment", "files": ["package/files/common.sh", "package/files/apt.sh", "package/files/pkg.sh", "package/files/yum.sh", "package/files/zypper.sh"]}
   ],
   "extensions": {
     "discovery": {

tasks/linux.sh

@@ -7,7 +7,7 @@ for f in "$PT__installdir"/package/files/*sh; do
   source "$f"
 done
 
-package_managers=("apt-get" "yum" "zypper")
+package_managers=("apt-get" "pkg" "yum" "zypper")
 options=()
 
 for p in "${package_managers[@]}"; do
@@ -18,7 +18,7 @@ for p in "${package_managers[@]}"; do
 done
 
 [[ $available_manager ]] || {
-  validation_error "No package managers found: Must be one of: [apt, yum, zypper]"
+  validation_error "No package managers found: Must be one of: [apt, pkg, yum, zypper]"
 }
 
 # For any package manager, check if the action is "status". If so, only run a status command
@@ -65,6 +65,42 @@ case "$available_manager" in
     esac
     ;;
 
+  "pkg")
+    # quiet and assume yes
+    options+=("-yq")
+
+    [ ! -z "$manager_options" ]  && options+=("$manager_options")
+
+    # For Ruby compatability, 'status' and 'install' will check if the package is upgradable
+    case "$action" in
+      "status")
+        pkg_check_latest
+        ;;
+
+    "install")
+        pkg install "${options[@]}" "$name" >/dev/null || fail
+        pkg_check_latest
+        ;;
+
+      # uninstall: do not print any version information
+      "uninstall")
+        pkg remove "${options[@]}" "$name" >/dev/null || fail
+        success '{ "status": "uninstalled" }'
+        ;;
+
+      "upgrade")
+        action="install"
+        # Get the currently installed version to compare with the upgraded version
+        old_version="$(pkg_status '%v')"
+
+        pkg upgrade "${options[@]}" "$name" >/dev/null || fail
+        # For Ruby compatability, this command uses a different output format
+        cmd_status="$(pkg_status "{ \"old_version\": ${old_version}, \"version\": \"%v\" }")"
+        success "$cmd_status"
+        ;;
+    esac
+    ;;
+
   "yum")
     # assume yes
     options+=("-y")