From 6eea35c007d54e8972176378e1f7a74855833c60 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Einar=20J=C3=B8rgen=20Haraldseid?= Date: Mon, 29 Jul 2019 23:06:08 +0200 Subject: [PATCH] More fixes --- addfollowmeprint.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/addfollowmeprint.sh b/addfollowmeprint.sh index f422c52..8f0b2f9 100755 --- a/addfollowmeprint.sh +++ b/addfollowmeprint.sh @@ -257,7 +257,7 @@ if [ "${Uname}" = "darwin" ]; then fi ShareFound=$(smbutil view "//${Workgroup};${Username}:${Password}@${PrintServer}" 2>/dev/null | grep ${PrintFile} | cut -d " " -f 1) if [ "${ShareFound}" != "${PrintFile}" ]; then - printerror "Could not find printer share called ${PrintFile} on the server" + printerror "Could not find printer share called ${PrintFile} on the server" printerror "This script must be broken or outdated. Please contact orakel@ntnu.no for further assistance." exit 1 fi @@ -275,6 +275,7 @@ if [ "${Uname}" = "linux" ]; then else PrinterShare="smb://${Workgroup}/${PrintServer}/${PrintFile}" AuthInfo="username,password" + echo -e "\nNOTE: 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 and printing from LibreOffice. In those cases, supply your normal NTNU username and password. If this becomes too tedious, you can try using the --plaintext option.\n" fi if ! sudo lpadmin -p ${QueueName} \ -D "FollowMe print queue at NTNU" \ @@ -337,7 +338,3 @@ if ! sudo lpadmin -d ${QueueName}; then fi 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." -fi -- 2.30.2