SliTaz Repositories

     1.1 --- a/modules/convert	Thu Dec 17 15:44:35 2015 +0200
     1.2 +++ b/modules/convert	Fri Dec 18 11:39:34 2015 +0200
     1.3 @@ -61,12 +61,12 @@
     1.4  MAINTAINER="$maintainer"
     1.5  DEPENDS="$(find_depends)"
     1.6  EOT
     1.7 -		[ -s "$file/var/lib/upkg/files/*.config.bz2" ] &&
     1.8 +		[ -s $file/var/lib/upkg/files/*.config.bz2 ] &&
     1.9  			cat >> "$file/receipt" <<EOT
    1.10  CONFIG_FILES="$(bzcat $file/var/lib/upkg/files/*.config.bz2)"
    1.11  EOT
    1.12  		while read ext func; do
    1.13 -			[ -s "$file/fs/var/lib/upkg/scripts/*.$ext" ] || continue
    1.14 +			[ -s $file/fs/var/lib/upkg/scripts/*.$ext ] || continue
    1.15  			cat >> "$file/receipt" <<EOT
    1.16  
    1.17  $func()
    1.18 @@ -231,7 +231,7 @@
    1.19  DEPENDS="$(find_depends)"
    1.20  EOT
    1.21  		show_unresolved_lib "$file/receipt"
    1.22 -		rm -f "$file/fs/".[A-Z]*
    1.23 +		rm -f $file/fs/.[A-Z]*
    1.24  		tazpkg pack "$file"
    1.25  		mv "$file.tazpkg" "$TOP_DIR"
    1.26  	else
    1.27 @@ -269,7 +269,7 @@
    1.28  DEPENDS="$(find_depends)"
    1.29  EOT
    1.30  		show_unresolved_lib "$file/receipt"
    1.31 -		rm -f "$file/fs/".[A-Z]*
    1.32 +		rm -f $file/fs/.[A-Z]*
    1.33  		tazpkg pack "$file"
    1.34  		mv "$file.tazpkg" "$TOP_DIR"
    1.35  	else
    1.36 @@ -359,9 +359,9 @@
    1.37  	cd "$TMP_DIR"
    1.38  	parse_pkgname .pet
    1.39  	tar -xzf "$PACKAGE_FILE" 2>/dev/null
    1.40 -	. "$package"*/*.specs
    1.41 +	. $package*/*.specs
    1.42  	desc="$PETMENUDESCR"
    1.43 -	mv "$package"*/ fs
    1.44 +	mv $package*/ fs
    1.45  	finish_convert_puppy
    1.46  }
    1.47  
    1.48 @@ -394,13 +394,13 @@
    1.49  DEPENDS="$(find_depends)"
    1.50  EOT
    1.51  	show_unresolved_lib "$file/receipt"
    1.52 -	[ -f "$file/fs/var/log/scripts/$package"* ] && cat >> "$file/receipt" <<EOM
    1.53 +	[ -f $file/fs/var/log/scripts/$package* ] && cat >> "$file/receipt" <<EOM
    1.54  
    1.55  post_install()
    1.56  {
    1.57  chroot \$1/ sh - << EOT
    1.58  cd /
    1.59 -$(cat "$file/fs/var/log/scripts/$package"* | sed -e 's/\\/\\\\/g' | sed -e 's/\$/\\$/g')
    1.60 +$(cat $file/fs/var/log/scripts/$package* | sed -e 's/\\/\\\\/g' | sed -e 's/\$/\\$/g')
    1.61  EOT
    1.62  }
    1.63  EOM
    1.64 @@ -487,7 +487,7 @@
    1.65  MAINTAINER="nobody@slitaz.org"
    1.66  EOT
    1.67  		LICENSE=$(grep /usr/share/common-licenses/ \
    1.68 -		  "$PACKAGE_FILE" "$TMP_DIR/$file/fs/usr/share/doc/"*"/copyright" | \
    1.69 +		  "$PACKAGE_FILE" $TMP_DIR/$file/fs/usr/share/doc/*/copyright | \
    1.70  		  sed 's|.*common-licenses/\([-\.A-Za-z0-9]*\).*|\1|;s|[-\.]$||;q')
    1.71  		[ -n "$LICENSE" ] && echo "LICENSE=\"$LICENSE\"" >> "$file/receipt"
    1.72  		echo "DEPENDS=\"$(find_depends)\"" >> "$file/receipt"