Date: Fri, 28 Jun 2013 16:43:42 +0200
From: Natanael Copa <ncopa@alpinelinux.org>
To: Dubiousjim <dubiousjim@gmail.com>
Cc: alpine-devel@lists.alpinelinux.org
Subject: Re: [alpine-devel] [PATCH 7/8] main/syslinux: don't create backup
 when no changes
Message-ID: <20130628164342.1b7d4e76@ncopa-desktop.alpinelinux.org>
In-Reply-To: <9f64bdebfb6a83b015fe0a1d7c08750926fb0ab1.1372318132.git.dubiousjim@gmail.com>
References: <cover.1372318132.git.dubiousjim@gmail.com>
	<9f64bdebfb6a83b015fe0a1d7c08750926fb0ab1.1372318132.git.dubiousjim@gmail.com>
Precedence: list
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit

On Thu, 27 Jun 2013 03:32:20 -0400
Dubiousjim <dubiousjim@gmail.com> wrote:

> ---
>  main/syslinux/update-extlinux | 16 ++++++++++------
>  1 file changed, 10 insertions(+), 6 deletions(-)
> 
> diff --git a/main/syslinux/update-extlinux b/main/syslinux/update-extlinux
> index 66bc0ed..a8b0474 100755
> --- a/main/syslinux/update-extlinux
> +++ b/main/syslinux/update-extlinux
> @@ -169,18 +169,22 @@ if [ -f "/boot/reboot.c32" ]; then
>  	echo "" >> $conf.new
>  fi
>  
> +if diff -q $conf.new $conf >/dev/null 2>&1; then
> +	everbose "Configuration unchanged."
> +	rm $conf.new
> +fi

maybe use 'cmp -s' instead of diff?

>  if [ "$overwrite" != "1" ]; then
>  	exit 0
> -fi
> +elif [ -f "$conf.new" ]; then
> +	# keep a backup just in case
> +	if [ -f "$conf" ]; then
> +		mv $conf $conf.old
> +	fi
>  
> -# keep a backup just in case
> -if [ -f "$conf" ]; then
> -	mv $conf $conf.old
> +	mv $conf.new $conf
>  fi
>  
> -mv $conf.new $conf
> -
>  everbose "Installing libutil.c32 libcom32.c32 mboot.c32 menu.c32 vesamenu.c32 to /boot."
>  cp /usr/share/syslinux/libutil.c32 \
>  	/usr/share/syslinux/libcom32.c32 \

otherwise looks good to me.

-nc


---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---