From f94f80685652c3dc37d7ca40a27e779f2cf3e3a0 Mon Sep 17 00:00:00 2001 From: Sylvain Pineau Date: Tue, 14 Jul 2020 12:01:43 +0200 Subject: bin:network_printer_test -> network_printer_test.sh --- bin/network_printer_test | 57 --------------------------------------------- bin/network_printer_test.sh | 57 +++++++++++++++++++++++++++++++++++++++++++++ units/networking/jobs.pxu | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) delete mode 100755 bin/network_printer_test create mode 100755 bin/network_printer_test.sh diff --git a/bin/network_printer_test b/bin/network_printer_test deleted file mode 100755 index 19d98d2..0000000 --- a/bin/network_printer_test +++ /dev/null @@ -1,57 +0,0 @@ -#!/bin/bash - -usage() { - cat < ] [ -s ] - - -p -- specify a printer to use, by name - -s -- specify a network server to use - - Note: this script expects printers over the IPP protocol only. - -EOU -} - -while [ $# -gt 0 ] -do - case "$1" in - -p) - if echo ${2} | grep -q -c '^-'; then - usage - exit 1 - fi - printer=${2} - shift - ;; - -s) - if echo ${2} | grep -q -c '^-'; then - usage - exit 1 - fi - server=${2} - shift - ;; - --usage) - usage - exit 1 - ;; - esac - shift -done - -if [ -z $server ]; then - echo "Nothing to do with no server defined. (See $0 --usage)" - exit 0 -fi - -printer=${printer:-PDF} - -lpadmin -E -v ipp://${server}/printers/${printer} -cupsenable ${printer} -cupsaccept ${printer} - -lsb_release -a | lp -t "lsb_release" -d ${printer} - diff --git a/bin/network_printer_test.sh b/bin/network_printer_test.sh new file mode 100755 index 0000000..19d98d2 --- /dev/null +++ b/bin/network_printer_test.sh @@ -0,0 +1,57 @@ +#!/bin/bash + +usage() { + cat < ] [ -s ] + + -p -- specify a printer to use, by name + -s -- specify a network server to use + + Note: this script expects printers over the IPP protocol only. + +EOU +} + +while [ $# -gt 0 ] +do + case "$1" in + -p) + if echo ${2} | grep -q -c '^-'; then + usage + exit 1 + fi + printer=${2} + shift + ;; + -s) + if echo ${2} | grep -q -c '^-'; then + usage + exit 1 + fi + server=${2} + shift + ;; + --usage) + usage + exit 1 + ;; + esac + shift +done + +if [ -z $server ]; then + echo "Nothing to do with no server defined. (See $0 --usage)" + exit 0 +fi + +printer=${printer:-PDF} + +lpadmin -E -v ipp://${server}/printers/${printer} +cupsenable ${printer} +cupsaccept ${printer} + +lsb_release -a | lp -t "lsb_release" -d ${printer} + diff --git a/units/networking/jobs.pxu b/units/networking/jobs.pxu index bf9254f..b5a6805 100644 --- a/units/networking/jobs.pxu +++ b/units/networking/jobs.pxu @@ -75,7 +75,7 @@ plugin: shell category_id: com.canonical.plainbox::networking id: networking/printer requires: package.name == 'cups-client' -command: network_printer_test -s $CHECKBOX_SERVER +command: network_printer_test.sh -s $CHECKBOX_SERVER _description: Try to enable a remote printer on the network and print a test page. plugin: shell -- cgit v1.2.3