Hello community, here is the log from the commit of package pin for openSUSE:Factory checked in at 2014-11-19 20:26:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pin (Old) and /work/SRC/openSUSE:Factory/.pin.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pin" Changes: -------- --- /work/SRC/openSUSE:Factory/pin/pin.changes 2014-10-08 22:14:23.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.pin.new/pin.changes 2014-11-19 20:30:23.000000000 +0100 @@ -1,0 +2,5 @@ +Sun Oct 19 17:49:00 UTC 2014 - Led <[email protected]> + +- fix bashisms + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pin ++++++ --- /var/tmp/diff_new_pack.8qy3Cc/_old 2014-11-19 20:30:26.000000000 +0100 +++ /var/tmp/diff_new_pack.8qy3Cc/_new 2014-11-19 20:30:26.000000000 +0100 @@ -99,14 +99,19 @@ trap "rm -f \"$OUT_FILE\"; stty sane; exit 1" 1 2 3 7 13 15 unknown_option () { - echo -e "\n Pin searches the installed packages (rpm -qi, -ql) and/or - the ARCHIVES.gz file for the desired information. It - shows also README, README.SuSE, FAQ, when available. - \n unknown option + cat <<__EOF__ + +Pin searches the installed packages (rpm -qi, -ql) and/or the ARCHIVES.gz file +for the desired information. It shows also README, README.SuSE, FAQ, when +available. + +unknown option options : pin open dialog inputbox pin string searches for string pin -v version string use another version, not the current-i386 - pin -f string grepping also if package was found \n" + pin -f string grepping also if package was found + +__EOF__ exit 1 } @@ -123,14 +128,23 @@ copy_archives () { if [ ! -r "$ARC_DIR""ARCHIVES_""$USED_VERSION"".gz" ] ; then - echo -e "\n no file "ARCHIVES_""$USED_VERSION"".gz" found " - echo -e "\n please insert CD1/DVD in your CD-ROM/DVD drive / bitte CD1/DVD einlegen\n - please eject all medias from other drives / bitte entfernen Sie andere Medien aus den Laufwerken.\n - \n press enter to continue - Bitte enter druecken" - - read - - echo -e "\n please wait / bitte warten \n" + cat <<__EOF__ + +no file ARCHIVES_$USED_VERSION.gz found + +please insert CD1/DVD in your CD-ROM/DVD drive / bitte CD1/DVD einlegen + +please eject all medias from other drives / +bitte entfernen Sie andere Medien aus den Laufwerken. + +press enter to continue - Bitte enter druecken +__EOF__ + + read dummy + + echo + echo "please wait / bitte warten" + echo if [ ! -e $ARC_DIR ] ; then mkdir $ARC_DIR @@ -140,22 +154,28 @@ USED_DEVICE="`hwinfo --cdrom | grep -i SuSE -B 10 | grep Device\ File: | cut -f2 -d : | cut -f2 -d " "`" if [ "$USED_DEVICE" = "" ] ; then - echo -e " no SUSE CD/DVD found, please copy ARCHIVES.gz manually to - /var/lib/pin/ARCHIVES_"$USED_VERSION".gz and execute - \"ln -s /var/lib/pin/ARCHIVES_"$USED_VERSION".gz /var/lib/pin/ARCHIVES.gz\" \n - keine SUSE CD/DVD gefunden, bitte ARCHIVES.gz manuell nach - /var/lib/pin/ARCHIVES_"$USED_VERSION".gz kopieren und - \"ln -s /var/lib/pin/ARCHIVES_"$USED_VERSION".gz /var/lib/pin/ARCHIVES.gz\" aufrufen \n" - exit + cat <<__EOF__ +no SUSE CD/DVD found, please copy ARCHIVES.gz manually to +/var/lib/pin/ARCHIVES_$USED_VERSION.gz and execute +"ln -s /var/lib/pin/ARCHIVES_$USED_VERSION.gz /var/lib/pin/ARCHIVES.gz" + +keine SUSE CD/DVD gefunden, bitte ARCHIVES.gz manuell nach +/var/lib/pin/ARCHIVES_$USED_VERSION.gz kopieren und +"ln -s /var/lib/pin/ARCHIVES_$USED_VERSION.gz /var/lib/pin/ARCHIVES.gz" aufrufen + +__EOF__ + + exit fi USED_DIR="`mount | grep "$USED_DEVICE" | cut -f3 -d " "`" - [ -z "$USED_DIR" ] && { echo -e "\n ERROR: CD/DVD not mounted" >&2; exit 1; } + [ -z "$USED_DIR" ] && { echo >&2; echo " ERROR: CD/DVD not mounted" >&2; exit 1; } CDROM="$USED_DIR" - - echo -e "\n copy ARCHIVES.gz to $ARC_DIR...\n" + echo + echo " copy ARCHIVES.gz to $ARC_DIR..." + echo if [ -f "$CDROM/ARCHIVES.gz" ] ; then cp "$CDROM""/ARCHIVES.gz" "$ARC_DIR""ARCHIVES_""$USED_VERSION"".gz" if [ -r "$GREP_FILE" ] ; then @@ -164,39 +184,58 @@ # make link ln -s "ARCHIVES_""$USED_VERSION"".gz" "$GREP_FILE" 2>/dev/null if [ "$?" = 1 ] ; then - echo -e "\n error, could not make link" + echo + echo " error, could not make link" echo " press return to delete old ARCHIVES.gz" - read + read dummy rm "$GREP_FILE" ln -s "ARCHIVES_""$USED_VERSION"".gz" "$GREP_FILE" 2>/dev/null fi else - echo -e "\n file not found, maybe wrong CD?\n please insert the first CD/DVD and restart\n\n" + echo + echo " file not found, maybe wrong CD?" + echo " please insert the first CD/DVD and restart" + echo + echo fi fi } if [ ! -r "$ARC_DIR""ARCHIVES_""$USED_VERSION"".gz" ] ; then # roottest - if test "$UID" != "0" -a "$USER" != root -a -z "$ROOT" ; then - echo -e "\n *** pin found no ARCHIVES_"$USED_VERSION".gz file in $ARC_DIR\n - pin will copy the files, please enter root password :\n\n" + if test "$(id -ru)" != "0" -a "$USER" != root -a -z "$ROOT" ; then + cat <<__EOF__ + + *** pin found no ARCHIVES_"$USED_VERSION".gz file in $ARC_DIR + + pin will copy the files, please enter root password : + + +__EOF__ su - root -s /bin/bash -- "$0" "$@" exit fi # test for old ARC files if [ -r "$GREP_FILE_OLD" ] ; then - echo -e "\n copy the files from $ARC_DIR_OLD to $ARC_DIR .... \n\n" + echo + echo " copy the files from $ARC_DIR_OLD to $ARC_DIR ...." + echo + echo if [ ! -r "$ARC_DIR" ] ; then mkdir $ARC_DIR fi ARC_DIR_OLD="$ARC_DIR_OLD""*" - cp -v $ARC_DIR_OLD $ARC_DIR && echo -e "\n files copied, you can remove $ARC_DIR_OLD\n if you want." + if cp -v $ARC_DIR_OLD $ARC_DIR; then + echo + echo " files copied, you can remove $ARC_DIR_OLD if you want." + fi if [ -r "$GREP_FILE" ] ; then cd $ARC_DIR mv $ARC_BASE ARCHIVES_old_backup.gz - echo -e "\n moved old $ARC_BASE to ARCHIVES_old_backup.gz \n rename it if you still need search this version" + echo + echo " moved old $ARC_BASE to ARCHIVES_old_backup.gz" + echo " rename it if you still need search this version" fi fi @@ -221,11 +260,13 @@ if [ -r ""$ARC_DIR""$PIN_VERSION"" ] ; then GREP_FILE=""$ARC_DIR""$PIN_VERSION"" else - echo -e " $OPTARG not found! \n" + echo " $OPTARG not found!" + echo # display all versions found in ARC_DIR while true ; do echo "$ARC_FILES" - echo -e "\n please choose a version from above, \n just enter the name" + echo + echo " please choose a version from above, just enter the name" read GREP_FILE if [ "$GREP_FILE" = "" ] ;then GREP_FILE=""$ARC_DIR""$ARC_BASE"" @@ -255,12 +296,17 @@ echo exit 1 else - echo -e "\n $GREP_FILE not found, copy ARCHIVES.gz from SuSE CD1 (or DVD) to - /var/lib/pin/ARCHIVES_"$USED_VERSION".gz and execute - \"ln -s /var/lib/pin/ARCHIVES_"$USED_VERSION".gz /var/lib/pin/ARCHIVES.gz\" \n - $GREP_FILE nicht gefunden, bitte ARCHIVES.gz manuell nach - /var/lib/pin/ARCHIVES_"$USED_VERSION".gz kopieren und - \"ln -s /var/lib/pin/ARCHIVES_"$USED_VERSION".gz /var/lib/pin/ARCHIVES.gz\" aufrufen \n" + cat <<__EOF__ + + $GREP_FILE not found, copy ARCHIVES.gz from SuSE CD1 (or DVD) to + /var/lib/pin/ARCHIVES_$USED_VERSION.gz and execute + "ln -s /var/lib/pin/ARCHIVES_$USED_VERSION.gz /var/lib/pin/ARCHIVES.gz" + + $GREP_FILE nicht gefunden, bitte ARCHIVES.gz manuell nach + /var/lib/pin/ARCHIVES_$USED_VERSION.gz kopieren und + "ln -s /var/lib/pin/ARCHIVES_$USED_VERSION.gz /var/lib/pin/ARCHIVES.gz" aufrufen + +__EOF__ exit fi @@ -289,32 +335,50 @@ exit fi -echo -e "pin $VER - package info for $SEARCH" > $OUT_FILE +echo "pin $VER - package info for $SEARCH" > $OUT_FILE if [ "$PIN_OPTION" != "-v" ] ; then # check rpm -qi $SEARCH 2> /dev/null 1> /dev/null if [ $? != 0 ] ; then - echo -e "\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** no rpm named $SEARCH installed" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + +------------------------------------------------------------------ +*** no rpm named $SEARCH installed +------------------------------------------------------------------ + +__EOF__ RPM_ALL="`rpm -qa --nosignature --nodigest | grep $SEARCH`" if [ "$RPM_ALL" != "" ] ; then - echo -e " maybe just a typo? what about this:\n" >> $OUT_FILE - echo "$RPM_ALL" >> $OUT_FILE - echo -e "\n maybe better restart with another option? grepping anyway ...\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + maybe just a typo? what about this: + +$RPM_ALL + + maybe better restart with another option? grepping anyway ... + +__EOF__ fi PIN_FULL="-f" else - echo -e "\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** rpm info" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + +------------------------------------------------------------------ +*** rpm info +------------------------------------------------------------------ + +__EOF__ rpm -qi $SEARCH >> $OUT_FILE - echo -e "\n\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** rpm filelist (*=executeable)" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + + +------------------------------------------------------------------ +*** rpm filelist (*=executeable) +------------------------------------------------------------------ + +__EOF__ rpm -ql $SEARCH | \ while read line @@ -327,30 +391,50 @@ done if [ -e /usr/share/doc/packages/$SEARCH ] ; then - echo -e "\n\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** /usr/share/doc/packages/$SEARCH/" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + + +------------------------------------------------------------------ +*** /usr/share/doc/packages/$SEARCH/ +------------------------------------------------------------------ + +__EOF__ ls -l /usr/share/doc/packages/$SEARCH/ >> $OUT_FILE fi if [ -e /usr/share/doc/packages/$SEARCH/README.SuSE ] ; then - echo -e "\n\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** README.SuSE" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + + +------------------------------------------------------------------ +*** README.SuSE +------------------------------------------------------------------ + +__EOF__ cat /usr/share/doc/packages/$SEARCH/README.SuSE >> $OUT_FILE fi if [ -e /usr/share/doc/packages/$SEARCH/README ] ; then - echo -e "\n\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** README" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + + +------------------------------------------------------------------ +*** README +------------------------------------------------------------------ + +__EOF__ cat /usr/share/doc/packages/$SEARCH/README >> $OUT_FILE fi if [ -e /usr/share/doc/packages/$SEARCH/FAQ ] ; then - echo -e "\n\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** FAQ" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + + +------------------------------------------------------------------ +*** FAQ +------------------------------------------------------------------ + +__EOF__ cat /usr/share/doc/packages/$SEARCH/FAQ >> $OUT_FILE fi fi @@ -358,10 +442,16 @@ fi if [ "$PIN_OPTION" = "-v" ] || [ "$PIN_FULL" = "-f" ] ; then - echo -e "\n grepping $GREP_FILE ... please wait\n" - echo -e "\n------------------------------------------------------------------" >> $OUT_FILE - echo -e "*** zgrep $SEARCH $GREP_FILE" >> $OUT_FILE - echo -e "------------------------------------------------------------------\n" >> $OUT_FILE + cat >> $OUT_FILE <<__EOF__ + + grepping $GREP_FILE ... please wait + + +------------------------------------------------------------------ +*** zgrep $SEARCH $GREP_FILE +------------------------------------------------------------------ + +__EOF__ ZGREP="`zgrep -i $SEARCH $GREP_FILE`" echo "$ZGREP" | grep -i "\-->" |sort >> $OUT_FILE echo >> $OUT_FILE -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
