packages: chromium-browser/update-source.sh - lessen indent

[glen]

Author: glen                         Date: Fri Feb 18 23:30:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- lessen indent

---- Files affected:
packages/chromium-browser:
   update-source.sh (1.18 -> 1.19) 

---- Diffs:

================================================================
Index: packages/chromium-browser/update-source.sh
diff -u packages/chromium-browser/update-source.sh:1.18 packages/chromium-browser/update-source.sh:1.19
--- packages/chromium-browser/update-source.sh:1.18	Sat Feb 19 00:28:10 2011
+++ packages/chromium-browser/update-source.sh	Sat Feb 19 00:30:33 2011
@@ -57,66 +57,67 @@
 rel=$(awk '/^%define[ 	]+rel[ 	]+/{print $NF}' $specfile)
 
 newtar=${pkg}_${version}~svn${svndate}r${svnver}.orig.tar.gz
-if [ "$newtar" != "$tarball" ]; then
-	echo "Updating $specfile $to $newtar"
-	version=${tarball#${pkg}_} version=${version%~*}
-	svndate=${tarball#*svn} svndate=${svndate%%r*}
-	svnver=${tarball#${pkg}_${version}~svn${svndate}r} svnver=${svnver%%.*}
-
-	sed -i -e "
-		s/^\(%define[ \t]\+svnver[ \t]\+\)[0-9]\+\$/\1$svnver/
-		s/^\(%define[ \t]\+svndate[ \t]\+\)[0-9]\+\$/\1$svndate/
-		s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
-	" $specfile
-
-	../builder -ncs -5 $specfile
-
-	if [ "$build_package" != 0 ]; then
-		dist=$(rpm -E %{pld_release})
-		arch=$(rpm -E %{_host_cpu})
-		outdir=$(readlink -f $dir)/build-$dist-$arch
-		logfile=$outdir/$pkg.log
-		rpmdir=$outdir/RPMS
-		install -d $rpmdir
-
-		# setup custom logfile via $HOME_ETC hack
-		# TODO: just add --logfile support for builder
-		cat > $outdir/.builderrc <<-EOF
-			if [ -n "$HOME_ETC" ]; then
-				. "$HOME_ETC/.builderrc"
-			elif [ -r ~/.builderrc ]; then
-				. ~/.builderrc
-			fi
-			LOGFILE='$logfile'
-		EOF
-
-		> $logfile
-		HOME_ETC=$outdir \
-			../builder -bb --clean \
-			--define "_unpackaged_files_terminate_build 1" \
-			--define '_enable_debug_packages 0' \
-			--define "_builddir $outdir" \
-			--define "_rpmdir $rpmdir" \
-			$specfile || {
-			echo "Package build failed"
-			tail -n 1000 $logfile >&2
-			exit 1
-		}
-
-		rpmdest=~/public_html/chromium-browser/$dist/$arch/
-		if [ "$publish_packages" ] && [ "$(ls $rpmdir/*.rpm 2>/dev/null)" ]; then
-			install -d $rpmdest
-			umask 022
-			chmod 644 $rpmdir/*.rpm
-			mv -v $rpmdir/*.rpm $rpmdest/
-			poldek --cachedir=$HOME/tmp --mkidx -s $rpmdest/ --mt=pndir
-
-			if [ -x /usr/bin/createrepo ]; then
-				install -d $rpmdest/repodata/cache
-				createrepo -q -c $rpmdest/repodata/cache $rpmdest
-			fi
+if [ "$newtar" = "$tarball" ]; then
+	echo "$specfile already up to $newtar"
+	exit 0
+fi
+
+echo "Updating $specfile $to $newtar"
+version=${tarball#${pkg}_} version=${version%~*}
+svndate=${tarball#*svn} svndate=${svndate%%r*}
+svnver=${tarball#${pkg}_${version}~svn${svndate}r} svnver=${svnver%%.*}
+
+sed -i -e "
+	s/^\(%define[ \t]\+svnver[ \t]\+\)[0-9]\+\$/\1$svnver/
+	s/^\(%define[ \t]\+svndate[ \t]\+\)[0-9]\+\$/\1$svndate/
+	s/^\(Version:[ \t]\+\)[.0-9]\+\$/\1$version/
+" $specfile
+
+../builder -ncs -5 $specfile
+
+if [ "$build_package" != 0 ]; then
+	dist=$(rpm -E %{pld_release})
+	arch=$(rpm -E %{_host_cpu})
+	outdir=$(readlink -f $dir)/build-$dist-$arch
+	logfile=$outdir/$pkg.log
+	rpmdir=$outdir/RPMS
+	install -d $rpmdir
+
+	# setup custom logfile via $HOME_ETC hack
+	# TODO: just add --logfile support for builder
+	cat > $outdir/.builderrc <<-EOF
+		if [ -n "$HOME_ETC" ]; then
+			. "$HOME_ETC/.builderrc"
+		elif [ -r ~/.builderrc ]; then
+			. ~/.builderrc
+		fi
+		LOGFILE='$logfile'
+	EOF
+
+	> $logfile
+	HOME_ETC=$outdir \
+		../builder -bb --clean \
+		--define "_unpackaged_files_terminate_build 1" \
+		--define '_enable_debug_packages 0' \
+		--define "_builddir $outdir" \
+		--define "_rpmdir $rpmdir" \
+		$specfile || {
+		echo "Package build failed"
+		tail -n 1000 $logfile >&2
+		exit 1
+	}
+
+	rpmdest=~/public_html/chromium-browser/$dist/$arch/
+	if [ "$publish_packages" ] && [ "$(ls $rpmdir/*.rpm 2>/dev/null)" ]; then
+		install -d $rpmdest
+		umask 022
+		chmod 644 $rpmdir/*.rpm
+		mv -v $rpmdir/*.rpm $rpmdest/
+		poldek --cachedir=$HOME/tmp --mkidx -s $rpmdest/ --mt=pndir
+
+		if [ -x /usr/bin/createrepo ]; then
+			install -d $rpmdest/repodata/cache
+			createrepo -q -c $rpmdest/repodata/cache $rpmdest
 		fi
 	fi
-else
-	echo "$specfile already up to $newtar"
 fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/chromium-browser/update-source.sh?r1=1.18&r2=1.19&f=u