SliTaz Repositories

     1.1 --- a/tazwok	Tue May 10 07:51:35 2011 +0000
     1.2 +++ b/tazwok	Wed May 11 11:16:01 2011 +0000
     1.3 @@ -477,7 +477,7 @@
     1.4  	report end-step
     1.5  	if { [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$nounpack" ] ; } || \
     1.6  	{ [ -f "$SOURCES_REPOSITORY/$TARBALL" ] && [ "$repack_src" != yes ] && [ "$nounpack" ] ; }; then
     1.7 -		[ -d "$tmp_src" ] && rm -r $tmp_src
     1.8 +		[ -d "$tmp_src" ] && rm -r "$tmp_src"
     1.9  		return 0
    1.10  	fi
    1.11  
    1.12 @@ -487,11 +487,11 @@
    1.13  	echo "untaring source tarball" >> $LOG
    1.14  
    1.15  	# If $tmp_src exists, there's already a unpacked tarball in it.
    1.16 -	if ! [ -d $tmp_src ]; then
    1.17 -		mkdir $tmp_src
    1.18 +	if ! [ -d "$tmp_src" ]; then
    1.19 +		mkdir "$tmp_src"
    1.20  		if [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && [ "$repack_src" = yes ]; then
    1.21  			lzma d $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma -so | \
    1.22 -				tar xf - -C $tmp_src
    1.23 +				tar xf - -C "$tmp_src"
    1.24  			repack_src=no
    1.25  			TARBALL=${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
    1.26  		elif [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
    1.27 @@ -519,15 +519,15 @@
    1.28  		fi
    1.29  
    1.30  		# Check if uncompressed tarball is in a root dir or not.
    1.31 -		if [ "$(ls -A $tmp_src | wc -l)" -gt 1 ] || [ -f $(echo $tmp_src/*) ]; then
    1.32 +		if [ "$(ls -A $tmp_src | wc -l)" -gt 1 ] || [ -f "$(echo $tmp_src/*)" ]; then
    1.33  			if check_for_var_modification src _pkg; then
    1.34 -				mv $tmp_src $tmp_src-1
    1.35 -				mkdir $tmp_src
    1.36 -				mv $tmp_src-1 $tmp_src/${SOURCE:-$PACKAGE}-$VERSION
    1.37 +				mv "$tmp_src" "$tmp_src-1"
    1.38 +				mkdir "$tmp_src"
    1.39 +				mv "$tmp_src-1" "$tmp_src/${SOURCE:-$PACKAGE}-$VERSION"
    1.40  			else
    1.41 -				mv $tmp_src/* $WOK/$PACKAGE
    1.42 +				mv "$tmp_src"/* "$WOK/$PACKAGE"
    1.43  				repack_src=no
    1.44 -				rm -r $tmp_src
    1.45 +				rm -r "$tmp_src"
    1.46  				tazwok_warning "Putting all files in $WOK/$PACKAGE; not sure about how to handle this tarball (no root dir)... Please try to remove src/_pkg definition from the receipt if you encounter any problems."
    1.47  			fi
    1.48  		fi
    1.49 @@ -537,7 +537,7 @@
    1.50  			report step "Repacking sources in .tar.lzma format"
    1.51  			[ "$TARBALL" ] && rm -f $SOURCES_REPOSITORY/$TARBALL
    1.52  			TARBALL=${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
    1.53 -			cd $tmp_src
    1.54 +			cd "$tmp_src"
    1.55  			tar -c * | lzma e $SOURCES_REPOSITORY/$TARBALL -si
    1.56  	fi
    1.57  
    1.58 @@ -556,7 +556,7 @@
    1.59  	fi
    1.60  
    1.61  	if [ "$nounpack" ]; then
    1.62 -		[ -d "$tmp_src" ] && rm -r $tmp_src
    1.63 +		[ -d "$tmp_src" ] && rm -r "$tmp_src"
    1.64  		report end-step	
    1.65  		return
    1.66  	fi
    1.67 @@ -564,19 +564,19 @@
    1.68  		# Permissions settings.
    1.69  		chown -R root.root "$tmp_src"
    1.70  		if [ -d "$src" ]; then
    1.71 -			mkdir -p $src
    1.72 -			for f in $tmp_src/*/*; do
    1.73 -				cp -a $f $src || { report end-step; rm -r $tmp_src; return 1; }
    1.74 +			mkdir -p "$src"
    1.75 +			for f in "$tmp_src"/*/*; do
    1.76 +				cp -a "$f" "$src" || { report end-step; rm -r "$tmp_src"; return 1; }
    1.77  			done
    1.78  		else
    1.79  			if ! check_for_var_modification src _pkg && ! [ "$target" ]; then
    1.80  				src="${src%/*}/$(ls $tmp_src)"
    1.81  			fi
    1.82 -			mv $(echo $tmp_src/*) "$src" || { report end-step; rm -r $tmp_src; return 1; }
    1.83 +			mv "$(echo $tmp_src/*)" "$src" || { report end-step; rm -r "$tmp_src"; return 1; }
    1.84  		fi
    1.85 -		rm -r $tmp_src
    1.86 +		rm -r "$tmp_src"
    1.87  	else
    1.88 -		[ -d "$tmp_src" ] && rm -r $tmp_src
    1.89 +		[ -d "$tmp_src" ] && rm -r "$tmp_src"
    1.90  		echo "There's already something at $src. Abort." >&2
    1.91  	fi
    1.92  	report end-step