Tweak: Better supported syntax for URI on Linux

diff --git a/addfollowmeprint.sh b/addfollowmeprint.sh
index 75c7215146f52d14ea6c24918fad236cef843cda..035767d74655e860fe0606b66f7bb70fae2387b5 100755 (executable)
--- a/addfollowmeprint.sh
+++ b/addfollowmeprint.sh
@@ -83,12 +83,12 @@ if [ ${UID} -eq 0 ]; then
     printerror "Please run this script as your normal user, we will prompt you for your sudo password when needed. Or you can use the --plaintext option"
     exit 1
   fi
     printerror "Please run this script as your normal user, we will prompt you for your sudo password when needed. Or you can use the --plaintext option"
     exit 1
   fi

-fi
-
-echo "Please provide sudo password, as some parts of this script requires it"
-if ! sudo true; then
-  printerror "Sorry, this script requires working sudo privileges to function"
-  exit 1
+else
+  echo "Please provide sudo password, as some parts of this script requires it"
+  if ! sudo true; then
+    printerror "Sorry, this script requires working sudo privileges to function"
+    exit 1
+  fi

 fi
 
 # Test for supported OS
 fi
 
 # Test for supported OS


@@ -264,7 +264,7 @@ sudo lpadmin -x ${QueueName} > /dev/null 2>&1
 # The Linux way
 if [ "${Uname}" = "linux" ]; then
   if [ "${Plaintext}" = "YES" ]; then
 # The Linux way
 if [ "${Uname}" = "linux" ]; then
   if [ "${Plaintext}" = "YES" ]; then

-    PrinterShare="smb://${Username}:${Password}@${Workgroup}/${PrintServer}/${PrintFile}"
+    PrinterShare="smb://${Workgroup}/${Username}:${Password}@${PrintServer}/${PrintFile}"

     AuthInfo="none"
     echo -e "\nNOTE: Your credentials will be stored in plaintext in /etc/cups/printers.conf.\nThis is usually only necessary on headless systems or on systems that don't run a dbus-daemon and/or a keyring that can provide the org.freedesktop.secrets service.\nNeedless to say, this is not a good idea on multi-user systems.\n"
   else
     AuthInfo="none"
     echo -e "\nNOTE: Your credentials will be stored in plaintext in /etc/cups/printers.conf.\nThis is usually only necessary on headless systems or on systems that don't run a dbus-daemon and/or a keyring that can provide the org.freedesktop.secrets service.\nNeedless to say, this is not a good idea on multi-user systems.\n"
   else