tazpkg diff tazpkg @ rev 785

Change "cat EOT" (only this form is for Sublime Text I using, sorry)
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Apr 13 11:53:19 2015 +0300 (2015-04-13)
parents e29ee7395a4b
children 2d836243f5e2 27c791cae919
line diff
     1.1 --- a/tazpkg	Fri Apr 10 11:45:54 2015 +0300
     1.2 +++ b/tazpkg	Mon Apr 13 11:53:19 2015 +0300
     1.3 @@ -67,7 +67,7 @@
     1.4  
     1.5  
     1.6  # If category is not one of those translated in native language, keep it
     1.7 -# untranslated. This allows both native and english language support.
     1.8 +# untranslated. This allows both native and English language support.
     1.9  # This also supports custom categories.
    1.10  # And now we support spaces in translated categories
    1.11  
    1.12 @@ -79,7 +79,7 @@
    1.13  
    1.14  
    1.15  #
    1.16 -# TazPKG output functions
    1.17 +# TazPkg output functions
    1.18  #
    1.19  
    1.20  
    1.21 @@ -144,7 +144,7 @@
    1.22  # Print the usage.
    1.23  
    1.24  usage () {
    1.25 -	cat << EOT
    1.26 +	cat <<EOT
    1.27  
    1.28  $(_ 'SliTaz package manager - Version: %s' $(colorize 34 $VERSION))
    1.29  
    1.30 @@ -169,7 +169,7 @@
    1.31       search-pkgname		$(_ 'Search on mirror for package having a particular file')
    1.32  -sf  search-file		$(_ 'Search for file in all installed packages files')
    1.33  
    1.34 -     get				$(_ 'Download a package into the current directory')
    1.35 +-g   get				$(_ 'Download a package into the current directory')
    1.36  -gi  get-install		$(_ 'Download and install a package from the mirror')
    1.37       get-install-list	$(_ 'Download and install a list of packages from the mirror')
    1.38  -i   install			$(_ 'Install a local package')
    1.39 @@ -184,7 +184,7 @@
    1.40       repack				$(_ 'Create a package archive from an installed package')
    1.41       repack-config		$(_ 'Create a package archive with configuration files')
    1.42       recompress			$(_ 'Rebuild a package with a better compression ratio')
    1.43 -     block|unblock		$(_ 'Block an installed package version or unblock it for upgrade')
    1.44 +-b|u block|unblock		$(_ 'Block an installed package version or unblock it for upgrade')
    1.45       check				$(_ 'Verify consistency of installed packages')
    1.46  
    1.47       add-flavor			$(_ 'Install the flavor list of packages')
    1.48 @@ -212,7 +212,7 @@
    1.49  
    1.50  
    1.51  usage_up() {
    1.52 -	cat << EOT
    1.53 +	cat <<EOT
    1.54  $(emsg "<b>$(_ 'Usage for command up:')</b>") tazpkg up [$(_ 'option')]
    1.55  
    1.56   * $(longline "$(_ 'Without options run in interactive mode and ask before install')")
    1.57 @@ -2533,7 +2533,7 @@
    1.58  		_ 'Check completed.'; echo ;;
    1.59  
    1.60  
    1.61 -	block)
    1.62 +	block|-b)
    1.63  		# Add a pkg name to the list of blocked packages.
    1.64  		check_root $@
    1.65  		check_for_package_on_cmdline
    1.66 @@ -2552,7 +2552,7 @@
    1.67  		newline ;;
    1.68  
    1.69  
    1.70 -	unblock)
    1.71 +	unblock|-u)
    1.72  		# Remove a pkg name from the list of blocked packages.
    1.73  		check_root $@
    1.74  		check_for_package_on_cmdline
    1.75 @@ -2593,7 +2593,7 @@
    1.76  		newline ;;
    1.77  
    1.78  
    1.79 -	get)
    1.80 +	get|-g)
    1.81  		# Download a package with wget.
    1.82  		check_root $@
    1.83  		check_for_package_on_cmdline
    1.84 @@ -2879,7 +2879,7 @@
    1.85  					SUGGESTED=$(echo -n $SUGGESTED | sed "s/$s//")
    1.86  				done
    1.87  				fi
    1.88 -				cat << EOT
    1.89 +				cat <<EOT
    1.90  $(boldify $(echo $PACKAGE):) $SUGGESTED
    1.91  EOT
    1.92  			fi