Attachment 315220 Details for Bug 460429 – Improved Debian patch

[patch] Improved Debian patch

xastir-debian.diff (text/plain), 1.32 KB, created by Tomas Hoger on 2008-08-28 14:08:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tomas Hoger

Created: 2008-08-28 14:08:52 UTC

Size: 1.32 KB

patch

obsolete

>--- xastir-1.9.2.orig/scripts/get_shapelib.sh
>+++ xastir-1.9.2/scripts/get_shapelib.sh
>@@ -141,10 +141,11 @@
>     if (! grep /usr/local/lib /etc/ld.so.conf 2>&1 > /dev/null) 
>     then
>         printf "Warning: /usr/local/lib not in /etc/ld.so.conf - adding it\n"
>-        cp /etc/ld.so.conf /tmp
>-        printf "/usr/local/lib\n" >> /tmp/ld.so.conf
>+        TMPFILE=`mktemp -t`
>+        cp /etc/ld.so.conf $TMPFILE
>+        printf "/usr/local/lib\n" >> $TMPFILE
>         $SUDO cp /etc/ld.so.conf /etc/ld.so.conf.save 
>-        $SUDO cp /tmp/ld.so.conf /etc/ld.so.conf
>+        $SUDO cp $TMPFILE /etc/ld.so.conf
>     fi
> 
>     if ( grep /usr/local/lib /etc/ld.so.conf ) 
>only in patch2:
>unchanged:
>--- xastir-1.9.2.orig/scripts/get-maptools.sh
>+++ xastir-1.9.2/scripts/get-maptools.sh
>@@ -166,13 +166,14 @@
>     if (! grep /usr/local/lib $LDCONF_FILE 2>&1 > /dev/null) 
>     then
>         printf "Warning: /usr/local/lib not in %s - adding it\n" $LDCONF_FILE
>+	TMPFILE=`mktemp -t`
> 	if [ -f $LDCONF_FILE ]
> 	then
>-	        cp $LDCONF_FILE /tmp/ldconfig.tmp
>+	        cp $LDCONF_FILE $TMPFILE
> 	        $SUDO cp $LDCONF_FILE $LDCONF_FILE.orig.$$
> 	fi
>-        printf "/usr/local/lib\n" >> /tmp/ldconf.tmp
>-        $SUDO cp /tmp/ldconf.tmp $LDCONF_FILE
>+        printf "/usr/local/lib\n" >> $TMPFILE
>+        $SUDO cp $TMPFILE $LDCONF_FILE
> 
>     fi
>

Actions: View | Diff

Attachments on bug 460429: 315217 | 315220