SliTaz Repositories

     1.1 --- a/cook	Wed Jun 14 13:26:21 2017 +0300
     1.2 +++ b/cook	Fri Jun 16 16:40:34 2017 +0300
     1.3 @@ -72,8 +72,8 @@
     1.4  # We don't want these escapes in web interface.
     1.5  
     1.6  clean_log() {
     1.7 -	sed -i -e s'|\[70G\[ \[1;32m| |' \
     1.8 -		-e s'|\[0;39m \]||' $LOGS/${1:-$pkg}.log
     1.9 +	sed -i -e 's|\[70G\[ \[1;32m| |' \
    1.10 +		-e 's|\[0;39m \]||' $LOGS/${1:-$pkg}.log
    1.11  }
    1.12  
    1.13  
    1.14 @@ -507,7 +507,7 @@
    1.15  	cd $CACHE
    1.16  	[ "$1" == 'force' -o ! -s '/tmp/installed.cook.diff' ] && \
    1.17  		busybox diff installed.list installed.cook > /tmp/installed.cook.diff
    1.18 -	deps=$(cat /tmp/installed.cook.diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.19 +	deps=$(grep ^+[a-zA-Z0-9] /tmp/installed.cook.diff | wc -l)
    1.20  }
    1.21  
    1.22  
    1.23 @@ -518,8 +518,8 @@
    1.24  	diff='/tmp/installed.cook.diff'
    1.25  	[ -s "$diff" ] || return
    1.26  
    1.27 -	deps=$(cat $diff | grep ^+[a-zA-Z0-9] | sed s/^+//)
    1.28 -	nb=$(cat $diff | grep ^+[a-zA-Z0-9] | wc -l)
    1.29 +	deps=$(grep ^+[a-zA-Z0-9] $diff | sed 's|^+||')
    1.30 +	nb=$(grep ^+[a-zA-Z0-9] $diff | wc -l)
    1.31  	newline
    1.32  	_n 'Build dependencies to remove:'; echo " $nb"
    1.33  	[ -n "$root" ] && echo "root=\"$root\""
    1.34 @@ -977,7 +977,7 @@
    1.35  	cd $fs
    1.36  	find . -type f -print > ../files.list
    1.37  	find . -type l -print >> ../files.list
    1.38 -	cd ..; sed -i s/'^.'/''/ files.list
    1.39 +	cd ..; sed -i 's|^.||' files.list
    1.40  	status
    1.41  
    1.42  	# Md5sum of files.
    1.43 @@ -988,7 +988,7 @@
    1.44  		case "$file" in
    1.45  			/lib/modules/*/modules.*|*.pyc) continue ;;
    1.46  		esac
    1.47 -		md5sum "fs$file" | sed 's/  fs/  /'
    1.48 +		md5sum "fs$file" | sed 's|  fs|  |'
    1.49  	done < files.list > md5sum
    1.50  	status
    1.51  
    1.52 @@ -1006,16 +1006,15 @@
    1.53  		2>/dev/null | awk 'END{ print $1 }')
    1.54  
    1.55  	action 'Updating receipt sizes...'
    1.56 -	sed -i s/^PACKED_SIZE.*$// receipt
    1.57 -	sed -i s/^UNPACKED_SIZE.*$// receipt
    1.58 -	sed -i "s/^PACKAGE=/PACKED_SIZE=\"$PACKED_SIZE\"\nUNPACKED_SIZE=\"$UNPACKED_SIZE\"\nPACKAGE=/" receipt
    1.59 +	sed -i '/^PACKED_SIZE=/d; /^UNPACKED_SIZE=/d' receipt
    1.60 +	sed -i "s|^PACKAGE=|PACKED_SIZE=\"$PACKED_SIZE\"\nUNPACKED_SIZE=\"$UNPACKED_SIZE\"\nPACKAGE=|" receipt
    1.61  	status
    1.62  
    1.63  	# Set extra version.
    1.64  	if [ -n "$EXTRAVERSION" ]; then
    1.65  		action 'Updating receipt EXTRAVERSION: %s' "$EXTRAVERSION"
    1.66 -		sed -i s/^EXTRAVERSION.*$// receipt
    1.67 -		sed -i "s/^VERSION=/EXTRAVERSION=\"$EXTRAVERSION\"\nVERSION=/" receipt
    1.68 +		sed -i '/^EXTRAVERSION=/d' receipt
    1.69 +		sed -i "s|^VERSION=|EXTRAVERSION=\"$EXTRAVERSION\"\nVERSION=|" receipt
    1.70  		status
    1.71  	fi
    1.72  
    1.73 @@ -1078,7 +1077,7 @@
    1.74  	done
    1.75  	rm -r "$tempd"
    1.76  	mv -f $pkgdir/taz/$PACKAGE-$VERSION$EXTRAVERSION.tazpkg $PKGS
    1.77 -	sed -i /^${pkg}$/d $broken
    1.78 +	sed -i "/^${pkg}$/d" $broken
    1.79  	#action 'Removing source tree...'
    1.80  	#rm -f $WOK/$pkg/source; status
    1.81  }
    1.82 @@ -1453,7 +1452,7 @@
    1.83  		cat $activity ;;
    1.84  
    1.85  	search)
    1.86 -		# Just a simple search function, we dont need more actually.
    1.87 +		# Just a simple search function, we don't need more actually.
    1.88  		query="$2"
    1.89  		title 'Search results for "%s"' "$query"
    1.90  		cd $WOK; ls -1 | grep "$query"
    1.91 @@ -1519,9 +1518,9 @@
    1.92  		title 'Setting up your %s cross environment' "$arch"
    1.93  		init_db_files
    1.94  		sed -i \
    1.95 -			-e s"/ARCH=.*/ARCH=\"$arch\"/" \
    1.96 -			-e s"/CROSS_TREE=.*/CROSS_TREE=\"\/cross\/$arch\"/" \
    1.97 -			-e s'/BUILD_SYSTEM=.*/BUILD_SYSTEM=i486-slitaz-linux/' \
    1.98 +			-e "s|ARCH=.*|ARCH=\"$arch\"|" \
    1.99 +			-e "s|CROSS_TREE=.*|CROSS_TREE=\"/cross/$arch\"|" \
   1.100 +			-e 's|BUILD_SYSTEM=.*|BUILD_SYSTEM=i486-slitaz-linux|' \
   1.101  			/etc/slitaz/cook.conf
   1.102  		case "$arch" in
   1.103  			arm)
   1.104 @@ -1538,8 +1537,8 @@
   1.105  				host="$ARCH-slitaz-linux" ;;
   1.106  		esac
   1.107  		sed -i \
   1.108 -			-e s"/CFLAGS=.*/CFLAGS=\"$flags\"/" \
   1.109 -			-e s"/HOST_SYSTEM=.*/HOST_SYSTEM=$host/" /etc/slitaz/cook.conf
   1.110 +			-e "s|CFLAGS=.*|CFLAGS=\"$flags\"|" \
   1.111 +			-e "s|HOST_SYSTEM=.*|HOST_SYSTEM=$host|" /etc/slitaz/cook.conf
   1.112  		. /etc/slitaz/cook.conf
   1.113  		sysroot="$CROSS_TREE/sysroot"
   1.114  		tools="/cross/$arch/tools"
   1.115 @@ -1592,7 +1591,7 @@
   1.116  
   1.117  		action 'Preparing the package receipt...'
   1.118  		cp $DATA/receipt .
   1.119 -		sed -i s"/^PACKAGE=.*/PACKAGE=\"$pkg\"/" receipt
   1.120 +		sed -i "s|^PACKAGE=.*|PACKAGE=\"$pkg\"|" receipt
   1.121  		status; newline
   1.122  
   1.123  		# Interactive mode, asking and seding.
   1.124 @@ -1603,30 +1602,30 @@
   1.125  				_  'Package       : %s' "$pkg"
   1.126  
   1.127  				_n 'Version       : ' ; read answer
   1.128 -				sed -i s/'VERSION=\"\"'/"VERSION=\"$answer\""/ receipt
   1.129 +				sed -i "s|^VERSION=.*|VERSION=\"$answer\"|" receipt
   1.130  
   1.131  				_n 'Category      : ' ; read answer
   1.132 -				sed -i s/'CATEGORY=\"\"'/"CATEGORY=\"$answer\""/ receipt
   1.133 +				sed -i "s|^CATEGORY=.*|CATEGORY=\"$answer\"|" receipt
   1.134  
   1.135  				# L10n: Short description
   1.136  				_n 'Short desc    : ' ; read answer
   1.137 -				sed -i s/'SHORT_DESC=\"\"'/"SHORT_DESC=\"$answer\""/ receipt
   1.138 +				sed -i "s|^SHORT_DESC=.*|SHORT_DESC=\"$answer\"|" receipt
   1.139  
   1.140  				_n 'Maintainer    : ' ; read answer
   1.141 -				sed -i s/'MAINTAINER=\"\"'/"MAINTAINER=\"$answer\""/ receipt
   1.142 +				sed -i "s|^MAINTAINER=.*|MAINTAINER=\"$answer\"|" receipt
   1.143  
   1.144  				_n 'License       : ' ; read answer
   1.145 -				sed -i s/'LICENSE=\"\"'/"LICENSE=\"$answer\""/ receipt
   1.146 +				sed -i "s|^LICENSE=.*|LICENSE=\"$answer\"|" receipt
   1.147  
   1.148  				_n 'Web site      : ' ; read answer
   1.149 -				sed -i s#'WEB_SITE=\"\"'#"WEB_SITE=\"$answer\""# receipt
   1.150 +				sed -i "s|^WEB_SITE=.*|WEB_SITE=\"$answer\"|" receipt
   1.151  				newline
   1.152  
   1.153  				# Wget URL.
   1.154  				_ 'Wget URL to download source tarball.'
   1.155  				_n 'Example  : ' ; echo '$GNU_MIRROR/$PACKAGE/$TARBALL'
   1.156  				_n 'Wget url : ' ; read answer
   1.157 -				sed -i "s|WGET_URL=.*|WGET_URL=\"$answer\"|" receipt
   1.158 +				sed -i "s|^WGET_URL=.*|WGET_URL=\"$answer\"|" receipt
   1.159  
   1.160  				# Ask for a stuff dir.
   1.161  				confirm "$(_n 'Do you need a stuff directory? (y/N)')"
   1.162 @@ -1654,9 +1653,10 @@
   1.163  
   1.164  		_ 'Starting cooking the list "%s"' "$2" | log
   1.165  
   1.166 -		for pkg in $(cat $2); do
   1.167 +		while read pkg; do
   1.168  			cook $pkg || broken
   1.169 -		done ;;
   1.170 +		done < $2
   1.171 +		;;
   1.172  
   1.173  	clean-wok)
   1.174  		check_root
   1.175 @@ -1765,7 +1765,7 @@
   1.176  			_ 'cook: %s' "error"
   1.177  			[ -n "$CROSS_BUGS" ] && _ 'bugs: %s' "$CROSS_BUGS"
   1.178  			_ 'Cook skip: %s' "$error" | log
   1.179 -			sed -i /^${pkg}$/d $broken
   1.180 +			sed -i "/^${pkg}$/d" $broken
   1.181  			newline
   1.182  			exit 0
   1.183  		fi
   1.184 @@ -1817,7 +1817,7 @@
   1.185  
   1.186  			--unblock|-ub)
   1.187  				action 'Unblocking package "%s"' "$pkg"
   1.188 -				sed -i "/^${pkg}$/"d $blocked
   1.189 +				sed -i "/^${pkg}$/d" $blocked
   1.190  				status; newline
   1.191  				exit 0 ;;
   1.192