Package: plucker Version: 1.8-8 Severity: normal Tags: patch -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1
plucker-prc-install still installs 1.6.1 by default. I have re-written it to use the current (1.8) version and included a number of variables to make future updates to the script much easier. I have also updated the man page for plucker-prc-install with new details, fixed some typos, and expanded the description of the nohires option. This should close out #289219. - -- System Information: Debian Release: testing/unstable APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing') Architecture: amd64 (x86_64) Shell: /bin/sh linked to /bin/bash Kernel: Linux 2.6.11-9-amd64-k8 Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ISO-8859-1) Versions of packages plucker depends on: ii netpbm 2:10.0-8 Graphics conversion tools ii python 2.3.5-3 An interactive high-level object-o ii python2.3 2.3.5-6 An interactive high-level object-o plucker recommends no packages. - -- no debconf information -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.1 (GNU/Linux) iD8DBQFDCb82BPYwh6bSSDcRAtimAKCD80HRa0UrCkwDgFldQ62WkpwkDQCeJ2mE sP3CkoOSCr+NuzVZNO98F4c= =HhbK -----END PGP SIGNATURE-----
--- plucker-prc-install 2005-08-22 06:27:24.000000000 -0500 +++ plucker-prc-install.new 2005-08-22 05:58:24.000000000 -0500 @@ -1,7 +1,8 @@ #!/bin/sh # plucker-prc-install: fetch and install plucker viewer .prc on the Palm -# Copyright (C) 2002, Ludovic Rousseau <[EMAIL PROTECTED]> +# Copyright (c) 2005, Alex Malinovich <[EMAIL PROTECTED]> +# Based on plucker-prc-install v1.1 by Ludovic Rousseau <[EMAIL PROTECTED]> # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,56 +20,71 @@ set -e -FILE=plucker_viewer-1.6.1.tar.bz2 -URL=http://downloads.plkr.org/1.6.1/ +NONEN=_translations +VERS=1.8 + +#NOTE: FILE is made of $FILE_PREFIX + $LORES + $NONEN + $FILE_SUFFIX +FILE_PREFIX=plucker_viewer +FILE_SUFFIX=-$VERS.tar.bz2 + +#directory within tar file containing necessary files +TAR_DIR=plucker-$VERS + +URL=http://downloads.plkr.org/$VERS TMP=/tmp/plucker-prc-install.$$ -PRCS="plucker-1.6.1/viewer/PluckerUserGuide.pdb plucker-1.6.1/viewer/SysZLib.prc" +PRCS="PluckerUserGuide.pdb SysZLib.prc" bad=0 if [ ! -x /usr/bin/wget ] then - echo "Error: You must install wget (wget package) to use this script!" - bad=1 + echo "Error: You must install wget (wget package) to use this script!" + bad=1 fi -if [ ! -x /usr/bin/pilot-xfer ] +if [ -x /usr/bin/gpilot-install-file ] then - echo "Error: You must install pilot-xfer (pilot-link package) to use this script!" - bad=1 + SYNC_CMD=gpilot-install-file +elif [ -x /usr/bin/pilot-xfer ] +then + SYNC_CMD=pilot-xfer -i +else + echo "Error: You must install pilot-xfer (pilot-link package) to use this script!" + bad=1 fi if [ $bad -ne 0 ] then - exit + exit fi # remove temporary files in case of premature exit (Ctrl-C) clean_exit() { - echo - rm -rf $TMP + echo + rm -rf $TMP } trap clean_exit INT case "$1" in - "-v"|"--version") - echo "pluckerc-prc-install: fetch and install plucker viewer .prc on the Palm" - echo "Version 1.1, October 2003" - echo "Copyright (C) 2002, Ludovic Rousseau <[EMAIL PROTECTED]>" - echo "This program is protected by the GNU GPL version 2 of later" - exit + "-v"|"--version") + echo "plucker-prc-install: fetch and install plucker viewer .prc on the Palm" + echo "Version 1.2, August 2005" + echo "Copyright (c) 2005, Alex Malinovich <[EMAIL PROTECTED]>" + echo "Based on plucker-prc-install v1.1 by Ludovic Rousseau <[EMAIL PROTECTED]>" + echo "This program is protected by the GNU GPL version 2 of later" + exit ;; - "--nohires") - FILE=plucker_viewer_nonhires-1.6.1.tar.bz2 + "--nohires") + LORES=_nonhires ;; - ?*) - echo "Usage: $0 [-nohires] [-h|--help] [-v] [--version]" - echo " -nohires: install non-hires version" - echo " instead of default hires version" - exit + ?*) + echo "Usage: $0 [--nohires] [-h|--help] [-v] [--version]" + echo " --nohires: install non-hires version" + echo " instead of default hires version" + exit ;; esac @@ -77,22 +93,35 @@ mkdir $TMP cd $TMP -wget $URL/$FILE -tar xjvf $FILE +FILE=$FILE_PREFIX$LORES$FILE_SUFFIX +echo -n "Downloading $URL/$FILE ... " +wget -q $URL/$FILE +echo "done!" +tar xjf $FILE + +if [ $PRC_LANG != "en" ] +then + FILE=$FILE_PREFIX$LORES$NONEN$FILE_SUFFIX + echo -n "Downloading $URL/$FILE ... " + wget -q $URL/$FILE + echo "done!" + tar xjf $FILE +fi + +cd $TAR_DIR -if [ ! -f plucker-1.6.1/viewer/viewer_$PRC_LANG.prc ] +if [ ! -f viewer_$PRC_LANG.prc ] then - echo "View for language $PRC_LANG does not exist" - echo "using English instead" - PRC_LANG=en + echo "Viewer for language $PRC_LANG does not exist, using English (en) instead" + PRC_LANG=en +else + echo "Using viewer language: $PRC_LANG" fi -echo "Using viewer language: $PRC_LANG" -PRCS="$PRCS plucker-1.6.1/viewer/viewer_$PRC_LANG.prc" +PRCS="$PRCS viewer_$PRC_LANG.prc" echo "Will install: " $PRCS -pilot-xfer -i $PRCS +$SYNC_CMD $PRCS rm -rf $TMP -
--- plucker-prc-install.1 2005-08-22 06:10:04.000000000 -0500 +++ plucker-prc-install.1.new 2005-08-22 06:42:12.000000000 -0500 @@ -2,7 +2,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH PLUCKER-PRC-INSTALL 1 "October 30, 2003" +.TH plucker-prc-install 1 "August 22, 2005" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -26,38 +26,39 @@ .B plucker-prc-install command. This manual page was written for the Debian distribution -because this script was created for the Debian package. +because this program was created for the Debian package. .PP .\" TeX users may be more comfortable with the \fB<whatever>\fP and .\" \fI<whatever>\fP escape sequences to invode bold face and italics, .\" respectively. -\fBplucker-prc-install\fP is a program that fetch and installs +\fBplucker-prc-install\fP is a program that fetches and installs the Plucker viewer application. .PP -The script uses +The program uses .B wget to get the .tar.bz2 archive from the Web. You need to be connected to the Internet and have .B wget -working correctly. You may have to -configure the environment variable http_proxy. You can have look at the +working correctly in order to use this program. You may have to +configure the environment variable http_proxy. You can take a look at the .B lynx command manpage to get information about http_proxy. .PP -The script tries to use the correct translation version of the viewer +The program tries to use the correct language version of the viewer according to the environment variable LANG. .PP -The script then uses +The program then uses either +.B gpilot-install-file +or .B pilot-xfer to transfer the three .prc files to the Palm pilot. .SH OPTIONS -This program follow the usual GNU command line syntax, with long +This program follows the usual GNU command line syntax, with long options starting with two dashes (`-'). A summary of options is included below. -For a complete description, see the Info files. .TP -.B \--nohires -installs the nohires version of the Plucker viewer +.B \-\-nohires +installs the low-resolution version of the Plucker viewer. If you are using a Palm with a 160x160 screen (Palm m500-series and earlier) you can save approximately 90 KB by installing the low-resolution version of the viewer. Note that the hires version will still work on older Palms, but will just take up unnecessary space. .TP .B \-h, \-\-help Show summary of options. @@ -67,6 +68,7 @@ .SH SEE ALSO .BR pilot-xfer (1), .BR wget (1), +.BR gpilot-install-file (1), .BR lynx (1). .SH AUTHOR This manual page was written by Ludovic Rousseau <[EMAIL PROTECTED]>,
