Adds custom debian functions and minor fixes

diff --git a/share/trashman/trashman/debian b/share/trashman/trashman/debian
new file mode 100644 (file)
index 0000000..bcc0e6b
--- /dev/null
+++ b/share/trashman/trashman/debian
@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+#
+# Custom functions for debian-like systems.
+#
+
+__trashman_apt_install() {
+  if [ -z "$1" ]; then
+    return
+  fi
+
+  LC_ALL=C DEBIAN_FRONTEND=noninteractive apt-get install -y $*
+}
+
+# Machine architecture
+__trashman_debian_arch() {
+  local arch="`uname -m`"
+
+  # Fix arch
+  if [ "$arch" = "x86_64" ]; then
+    arch="amd64"
+  fi
+
+  echo $arch
+}
+
+# Check if package is installed
+__trashman_apt_check() {
+  if [ -z "$1" ]; then
+    return
+  fi
+
+  dpkg -s $1 > /dev/null 2>&1
+  return $?
+}
+
+# Install a package
+__trashman_apt_install_packages() {
+  if [ -z "$1" ]; then
+    return
+  fi
+
+  for package in $*; do
+    dpkg -s $package > /dev/null 2>&1
+
+    if [ "$?" == "1" ]; then
+      __trashman_echo "Installing package $package..."
+      DEBIAN_FRONTEND=noninteractive $SUDO apt-get install $package -y || exit 1
+    fi
+  done
+}

diff --git a/share/trashman/trashman/functions b/share/trashman/trashman/functions
index 62eed03d74625957131a8c4c22ef1fd57f606830..5f655de3fb05539accfa826eb3a9b9ccbb0231b2 100644 (file)
--- a/share/trashman/trashman/functions
+++ b/share/trashman/trashman/functions
@@ -43,6 +43,11 @@ __trashman_distro_release() {
   fi
 }
 
+# Machine architecture
+__trashman_arch() {
+  uname -m
+}
+
 # Return the folder where actions are available for a package
 __trashman_actions_folder() {
   local package="$1"

diff --git a/trashman b/trashman
index 3e9859d362c8f6d4753017c2c9ed599b4e115d7e..43d8c567b211ed2a47f093dfc528c9592b823449 100755 (executable)
--- a/trashman
+++ b/trashman
@@ -88,11 +88,11 @@ else
 
           if [ "$ACTION" = "check" ]; then
             if [ "$status" = "0" ]; then
-              __trashman_echo "Package trashman is installed system-wide"
+              __trashman_echo "Package $package is installed system-wide"
             elif [ "$status" = "1" ]; then
-              __trashman_echo "Package trashman is not installed system-wide"
+              __trashman_echo "Package $package is not installed system-wide"
             elif [ "$status" = "2" ]; then
-              __trashman_echo "Package trashman is partially installed system-wide"
+              __trashman_echo "Package $package is partially installed system-wide"
             fi
           fi
         else