Contents of /trunk/nxserver-freenx/patches/nxserver-freenx-0.7.3-nxprint-warnings.patch
Parent Directory
| 
Revision Log
Revision 1797 -
(show annotations)
(download)
Tue Jun 5 12:14:07 2012 UTC (11 years, 11 months ago) by niro
File size: 1005 byte(s)
Tue Jun 5 12:14:07 2012 UTC (11 years, 11 months ago) by niro
File size: 1005 byte(s)
-fix some warnings
| 1 | diff -Naur freenx-server-0.7.3/nxprint freenx-server-0.7.3-magellan/nxprint |
| 2 | --- freenx-server-0.7.3/nxprint 2008-03-11 00:01:03.000000000 +0100 |
| 3 | +++ freenx-server-0.7.3-magellan/nxprint 2012-06-05 15:06:50.032982659 +0200 |
| 4 | @@ -51,14 +51,16 @@ |
| 5 | if [ -z "$(find $UTILITY_DRIVERS_CACHE.all -mmin -60 2> /dev/null)" ] |
| 6 | then |
| 7 | { |
| 8 | - cd /usr/share/ppd/ |
| 9 | - awk -F '"' '/\*Manufacturer:/ { a[FILENAME]=$2 } |
| 10 | + if [[ -d /usr/share/ppd ]] |
| 11 | + then |
| 12 | + cd /usr/share/ppd/ |
| 13 | + awk -F '"' '/\*Manufacturer:/ { a[FILENAME]=$2 } |
| 14 | /\*NickName:/ { b[FILENAME]=$2 } |
| 15 | - END { |
| 16 | - for (i in a) |
| 17 | - print "driver|" (a[i]=="ESP"?substr(b[i],0,index(b[i]," ")-1):a[i]) "|"b[i]"|"i"|en" |
| 18 | - }' $(find -name "*.ppd") |
| 19 | - |
| 20 | + END { |
| 21 | + for (i in a) |
| 22 | + print "driver|" (a[i]=="ESP"?substr(b[i],0,index(b[i]," ")-1):a[i]) "|"b[i]"|"i"|en" |
| 23 | + }' $(find -name "*.ppd") |
| 24 | + fi |
| 25 | if [ "$ENABLE_FOOMATIC" = "1" ] |
| 26 | then |
| 27 | [ -z "$COMMAND_FOOMATIC" ] && COMMAND_FOOMATIC="foomatic-ppdfile" |