Minor fixes

[einar-bin] / addfollowmeprint.sh

diff --git a/addfollowmeprint.sh b/addfollowmeprint.sh
index 3279bb13af01e32c8918421f76e9207cb6328889..f422c52549916e4f120697be7037030a57b232d3 100755 (executable)
--- a/addfollowmeprint.sh
+++ b/addfollowmeprint.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
 #!/bin/bash

-# This script installs the FollowMe print queue at NTNU on Linux (and possibly Mac) systems.
+# This script installs the FollowMe print queue at NTNU on Linux and possibly Mac systems.

 # The targeted and tested distros are: Debian, Ubuntu (and derivates), Fedora, CentOS, OpenSUSE and Mint
 # Copyright © 2017-2019 einar.haraldseid@ntnu.no
 
 # The targeted and tested distros are: Debian, Ubuntu (and derivates), Fedora, CentOS, OpenSUSE and Mint
 # Copyright © 2017-2019 einar.haraldseid@ntnu.no
 


@@ -8,7 +8,7 @@ function usage {
   echo "Usage: ./$(basename "${0}") [OPTIONS]"
   echo "Options:"
   echo " -m, --model {ricoh|generic}     Printer model to install (default: generic)"
   echo "Usage: ./$(basename "${0}") [OPTIONS]"
   echo "Options:"
   echo " -m, --model {ricoh|generic}     Printer model to install (default: generic)"

-  echo " -d, --driver {pcl,postscript}   Printer driver to use (default: postscript)"
+  echo " -d, --driver {pcl|postscript}   Printer driver to use (default: postscript)"

   echo " -f, --force                     Force running script as if on Linux systems"
   echo " -p, --plaintext                 Store credentials as plaintext in /etc/cups/printers.conf (Linux only)"
   echo " -h, --help                      Display this help text"
   echo " -f, --force                     Force running script as if on Linux systems"
   echo " -p, --plaintext                 Store credentials as plaintext in /etc/cups/printers.conf (Linux only)"
   echo " -h, --help                      Display this help text"


@@ -166,7 +166,7 @@ if [ "${Uname}" = "linux" ]; then
     if [ "${Model}" = "ricoh" ]; then
       # This should match Fedora and other modern rpm based systems that have dnf as the primary package manager
       if command -v dnf >/dev/null 2>&1; then
     if [ "${Model}" = "ricoh" ]; then
       # This should match Fedora and other modern rpm based systems that have dnf as the primary package manager
       if command -v dnf >/dev/null 2>&1; then

-        if ! sudo rpm -q foomatic-db-ppds 2>&1; then
+        if ! sudo rpm -q foomatic-db-ppds > /dev/null 2>&1; then

           printerror "You don't seem to have the correct printer drivers installed, please run:"
           printerror "  sudo dnf install foomatic-db-ppds"
           printerror "first, or use the generic model instead."
           printerror "You don't seem to have the correct printer drivers installed, please run:"
           printerror "  sudo dnf install foomatic-db-ppds"
           printerror "first, or use the generic model instead."


@@ -178,15 +178,15 @@ if [ "${Uname}" = "linux" ]; then
             DriverPath="foomatic-db-ppds/Ricoh/PXL/Ricoh-MP_C6003_PXL.ppd.gz"
           fi
         fi
             DriverPath="foomatic-db-ppds/Ricoh/PXL/Ricoh-MP_C6003_PXL.ppd.gz"
           fi
         fi

-      fi

       # This should match CentOS, RHEL and other RHEL based distros that have yum as the primary package manager
       # This should match CentOS, RHEL and other RHEL based distros that have yum as the primary package manager

-      if command -v yum >/dev/null 2>&1; then
-        if ! sudo rpm -q foomatic-filters >/dev/null 2>&1; then
+      elif command -v yum >/dev/null 2>&1; then
+        if ! sudo rpm -q foomatic-filters > /dev/null 2>&1; then

           printerror "You don't seem to have the foomatic-filters package installed, please run:"
           printerror "  sudo yum install foomatic-filters"
           printerror "first, or use the generic model instead."
           exit 1
           printerror "You don't seem to have the foomatic-filters package installed, please run:"
           printerror "  sudo yum install foomatic-filters"
           printerror "first, or use the generic model instead."
           exit 1

-        if ! sudo rpm -q foomatic-db-ppds >/dev/null 2>&1; then
+        fi
+        if ! sudo rpm -q foomatic-db-ppds > /dev/null 2>&1; then

           printerror "You don't seem to have the correct printer drivers installed, please run:"
           printerror "  sudo yum install foomatic-db-ppds"
           printerror "first, or use the generic model instead."
           printerror "You don't seem to have the correct printer drivers installed, please run:"
           printerror "  sudo yum install foomatic-db-ppds"
           printerror "first, or use the generic model instead."


@@ -340,4 +340,4 @@ echo "Printer successfully installed."
 
 if [ "${Uname}" = "linux" ] && [ "${Plaintext}" != "YES" ]; then
   echo -e "\nPlease note: due to the way credentials are stored and accessed on Linux, some print operations will still halt for credentials, notably the \"Print test page\" function. In those cases, supply your normal NTNU username and password."
 
 if [ "${Uname}" = "linux" ] && [ "${Plaintext}" != "YES" ]; then
   echo -e "\nPlease note: due to the way credentials are stored and accessed on Linux, some print operations will still halt for credentials, notably the \"Print test page\" function. In those cases, supply your normal NTNU username and password."

-fi
\ No newline at end of file
+fi