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: 8c9c6461d540
children: c389814e4f9a
files: tazpanel/pkgs.cgi tazpkg tazpkg-box
     1.1 --- a/tazpanel/pkgs.cgi	Mon Apr 13 01:42:49 2015 +0300
     1.2 +++ b/tazpanel/pkgs.cgi	Mon Apr 13 11:53:19 2015 +0300
     1.3 @@ -67,12 +67,12 @@
     1.4  
     1.5  		if [ -d $INSTALLED/$pkg ]; then
     1.6  			files="$(wc -l < $INSTALLED/$pkg/files.list)"
     1.7 -			cat << EOT
     1.8 +			cat <<EOT
     1.9  	<pre class="scroll">$(sort $INSTALLED/$pkg/files.list)</pre>
    1.10  	<footer>$(_p '%s file' '%s files' $files $files)</footer>
    1.11  EOT
    1.12  		else
    1.13 -			cat << EOT
    1.14 +			cat <<EOT
    1.15  	<pre class="scroll">$(lzcat files.list.lzma undigest/*/files.list.lzma \
    1.16  		2>/dev/null | awk -vp="$pkg:" '$1==p{print $2}' | sort)</pre>
    1.17  EOT
    1.18 @@ -129,7 +129,7 @@
    1.19  	do
    1.20  		class=pkg; [ -d $INSTALLED/${PACKAGE% } ] && class=pkgi
    1.21  		i18n_desc $PACKAGE
    1.22 -		cat << EOT
    1.23 +		cat <<EOT
    1.24  <tr>
    1.25  	<td><input type="checkbox" name="pkg" value="$PACKAGE">$(pkg_info_link $PACKAGE $class)</td>
    1.26  	<td>$VERSION</td>
    1.27 @@ -150,7 +150,7 @@
    1.28  			grep -q "^$PACKAGE$" $PKGS_DB/blocked-packages.list && class='pkgib'
    1.29  		fi
    1.30  		i18n_desc $PACKAGE
    1.31 -		cat << EOT
    1.32 +		cat <<EOT
    1.33  <tr>
    1.34  	<td><input type="checkbox" name="pkg" value="$PACKAGE">$(pkg_info_link $PACKAGE $class)</td>
    1.35  	<td>$VERSION</td>
    1.36 @@ -210,7 +210,7 @@
    1.37  # ENTER will search but user may search for a button, so put one.
    1.38  
    1.39  search_form() {
    1.40 -	cat << EOT
    1.41 +	cat <<EOT
    1.42  <form class="search"><!--
    1.43  	--><input type="search" name="search" results="5" autosave="pkgsearch" autocomplete="on"><!--
    1.44  	--><button type="submit">$(_n 'Search')</button><!--
    1.45 @@ -221,7 +221,7 @@
    1.46  
    1.47  
    1.48  table_head() {
    1.49 -	cat << EOT
    1.50 +	cat <<EOT
    1.51  <table class="wide zebra pkglist" id="head1">
    1.52  	<thead id="head2">
    1.53  		<tr>
    1.54 @@ -240,7 +240,7 @@
    1.55  	  my=$(COOKIE my);     my=${my:-my};       [ -n "$(GET my)" ]   &&   my=$(GET my)
    1.56  	 cat=$(COOKIE cat);   cat=${cat:-all};     [ -n "$(GET cat)" ]  &&  cat=$(GET cat)
    1.57  
    1.58 -	cat << EOT
    1.59 +	cat <<EOT
    1.60  <script type="text/javascript">
    1.61  function setCookie(name) {
    1.62  	if (name=='cat') {
    1.63 @@ -287,7 +287,7 @@
    1.64  #reminder; gettext 'all'; gettext 'extra'
    1.65  
    1.66  	if [ -d $PKGS_DB/undigest ]; then
    1.67 -		cat << EOT
    1.68 +		cat <<EOT
    1.69  	<h4>$(_ 'Repository')</h4>
    1.70  
    1.71  	<select id="repo" onchange="setCookie('repo')">
    1.72 @@ -300,7 +300,7 @@
    1.73  	<script type="text/javascript">setValue('repo', "$repo")</script>
    1.74  EOT
    1.75  	fi
    1.76 -	cat << EOT
    1.77 +	cat <<EOT
    1.78  	<a data-icon="tags" href="?tags">$(_ 'All tags...')</a><br/>
    1.79  	<a data-icon="list" href="?cats">$(_ 'All categories...')</a>
    1.80  </div>
    1.81 @@ -417,7 +417,7 @@
    1.82  	esac
    1.83  
    1.84  	if [ "$pager" != "<p>$(_ 'Pages:') </p>" ] && [ -n "${list:1:1}" ]; then
    1.85 -		cat << EOT
    1.86 +		cat <<EOT
    1.87  <h3>$(header_repo_name $i)</h3>
    1.88  $pager
    1.89  	$(table_head)
    1.90 @@ -438,7 +438,7 @@
    1.91  	# now pkgs='"pkg1", "pkg2", ... "pkgn"'
    1.92  
    1.93  	if [ -n "$pkgs" ]; then
    1.94 -		cat << EOT
    1.95 +		cat <<EOT
    1.96  <script type="text/javascript">
    1.97  var pkgs = [$pkgs];
    1.98  var theForm = document.getElementById('pkglist');
    1.99 @@ -494,7 +494,7 @@
   1.100  		search_form; sidebar
   1.101  		LOADING_MSG=$(_ 'Listing linkable packages...'); loading_msg
   1.102  
   1.103 -		cat << EOT
   1.104 +		cat <<EOT
   1.105  <h2>$(_ 'Linkable packages')</h2>
   1.106  
   1.107  <form class="wide">
   1.108 @@ -506,7 +506,7 @@
   1.109  			[ -s $pkg/receipt ] && continue
   1.110  			. $target/$INSTALLED/$pkg/receipt
   1.111  			i18n_desc $pkg
   1.112 -			cat << EOT
   1.113 +			cat <<EOT
   1.114  <tr>
   1.115  	<td><input type="checkbox" name="pkg" value="$pkg" /><a data-icon="pkg" href="?info=${pkg//+/%2B}">$pkg</a></td>
   1.116  	<td>$VERSION</td>
   1.117 @@ -515,7 +515,7 @@
   1.118  </tr>
   1.119  EOT
   1.120  		done
   1.121 -		cat << EOT
   1.122 +		cat <<EOT
   1.123  		</tbody>
   1.124  	</table>
   1.125  </form>
   1.126 @@ -532,7 +532,7 @@
   1.127  		echo "<h2>$(_ 'Categories list')</h2>"
   1.128  
   1.129  		for pkgsinfo in $(repo_list /packages.info); do
   1.130 -			cat << EOT
   1.131 +			cat <<EOT
   1.132  <section>
   1.133  	<header>$(header_repo_name $(dirname $pkgsinfo))</header>
   1.134  	<table class="wide zebra center">
   1.135 @@ -558,7 +558,7 @@
   1.136  			}' | sort | awk '{
   1.137  			printf "<tr><td><a href=\"?list&amp;cat=%s\">%s</a></td><td>%d</td><td>%d</td></tr>", $1, $1, $2, $3
   1.138  			}'
   1.139 -			cat << EOT
   1.140 +			cat <<EOT
   1.141  		</tbody>
   1.142  	</table>
   1.143  </section>
   1.144 @@ -588,7 +588,7 @@
   1.145  				esac ;;
   1.146  		esac
   1.147  
   1.148 -		cat << EOT
   1.149 +		cat <<EOT
   1.150  <h2>$(_ 'Packages list')</h2>
   1.151  <p>$title</p>
   1.152  
   1.153 @@ -597,7 +597,7 @@
   1.154  		[ ! -f $PKGS_DB/packages.info ] && msg warn \
   1.155  		"$(_ 'You can not view a list of all packages until recharging lists.')"
   1.156  
   1.157 -		[ "$REMOTE_USER" == "root" ] && cat << EOT
   1.158 +		[ "$REMOTE_USER" == "root" ] && cat <<EOT
   1.159  <section>
   1.160  	<div>$(_ 'Selected packages:') <span id="countSelected"></span></div>
   1.161  	<footer>
   1.162 @@ -609,14 +609,14 @@
   1.163  	</footer>
   1.164  </section>
   1.165  EOT
   1.166 -		cat << EOT
   1.167 +		cat <<EOT
   1.168  
   1.169  <form id="pkglist" class="wide">
   1.170  EOT
   1.171  		for i in $(repo_list ""); do
   1.172  			show_list ${my#no}
   1.173  		done
   1.174 -		cat << EOT
   1.175 +		cat <<EOT
   1.176  </form>
   1.177  <script type="text/javascript">window.onscroll = scrollHandler; setCountSelPkgs();</script>
   1.178  EOT
   1.179 @@ -635,7 +635,7 @@
   1.180  		sidebar
   1.181  		LOADING_MSG="$(_ 'Searching packages...')"; loading_msg
   1.182  
   1.183 -		cat << EOT
   1.184 +		cat <<EOT
   1.185  <h2>$(_ 'Search packages')</h2>
   1.186  
   1.187  <section>
   1.188 @@ -667,7 +667,7 @@
   1.189  					class='pkgi'
   1.190  					grep -q "^$PACKAGE$" $PKGS_DB/blocked-packages.list && class='pkgib'
   1.191  				fi
   1.192 -				cat << EOT
   1.193 +				cat <<EOT
   1.194  <tr>
   1.195  	<td><input type="checkbox" name="pkg" value="$PACKAGE">$(pkg_info_link $PACKAGE $class)</td>
   1.196  	<td>$(echo "$FILE" | sed "s|$pkg|<span class=\"diff-add\">&</span>|gI")</td>
   1.197 @@ -679,7 +679,7 @@
   1.198  			awk -F$'\t' 'BEGIN{IGNORECASE = 1}
   1.199  			$1 " " $4 ~ /'$pkg'/{print $0}' $(repo_list /packages.info) | parse_packages_info
   1.200  		fi
   1.201 -		cat << EOT
   1.202 +		cat <<EOT
   1.203  	</tbody>
   1.204  	</table>
   1.205  </form>
   1.206 @@ -695,7 +695,7 @@
   1.207  		search_form; sidebar
   1.208  		LOADING_MSG="$(_ 'Recharging lists...')"; loading_msg
   1.209  
   1.210 -		cat << EOT
   1.211 +		cat <<EOT
   1.212  <h2>$(_ 'Recharge')</h2>
   1.213  <p>$(_ 'Recharge checks for new or updated packages')</p>
   1.214  
   1.215 @@ -709,7 +709,7 @@
   1.216  EOT
   1.217  		echo $(_ 'Recharging packages list') | log
   1.218  		tazpkg recharge | filter_taztools_msgs
   1.219 -		cat << EOT
   1.220 +		cat <<EOT
   1.221  	</pre>
   1.222  
   1.223  	<footer>$(_ 'Packages lists are up-to-date. You should check for upgrades now.')</footer>
   1.224 @@ -725,7 +725,7 @@
   1.225  		search_form; sidebar
   1.226  		LOADING_MSG="$(_ 'Checking for upgrades...')"; loading_msg
   1.227  
   1.228 -		cat << EOT
   1.229 +		cat <<EOT
   1.230  <h2>$(_ 'Up packages')</h2>
   1.231  
   1.232  <section>
   1.233 @@ -746,7 +746,7 @@
   1.234  			grep -hs "^$pkg	" $PKGS_DB/packages.info $PKGS_DB/undigest/*/packages.info | parse_packages_info
   1.235  		done
   1.236  
   1.237 -		cat << EOT
   1.238 +		cat <<EOT
   1.239  		</tbody>
   1.240  	</table>
   1.241  </form>
   1.242 @@ -781,7 +781,7 @@
   1.243  			repack)  MSG="$(_ 'Repacking: %s'    "$bpkgs")" ;;
   1.244  		esac
   1.245  
   1.246 -		cat << EOT
   1.247 +		cat <<EOT
   1.248  <h2>TazPkg: $(GET do)</h2>
   1.249  <section>
   1.250  	<div>$MSG</div>
   1.251 @@ -803,7 +803,7 @@
   1.252  		search_form; sidebar
   1.253  		LOADING_MSG=$(_ 'Getting package info...'); loading_msg
   1.254  
   1.255 -		cat << EOT
   1.256 +		cat <<EOT
   1.257  <section>
   1.258  	<header>
   1.259  		$(_ 'Package %s' $pkg)
   1.260 @@ -850,7 +850,7 @@
   1.261  		i18n_desc $pkg
   1.262  
   1.263  		# Show info table
   1.264 -		cat << EOT
   1.265 +		cat <<EOT
   1.266  		</form>
   1.267  	</header>
   1.268  
   1.269 @@ -892,7 +892,7 @@
   1.270  
   1.271  		# Show configuration files list
   1.272  		CONFIGS="$(tazpkg list-config $pkg | sed 's|\(.*\)|\1 \1|')"
   1.273 -		[ -n "$CONFIGS" ] && cat << EOT
   1.274 +		[ -n "$CONFIGS" ] && cat <<EOT
   1.275  <section>
   1.276  	<header>$(_ 'Configuration files')</header>
   1.277  	<pre>$(printf '<a href="index.cgi?file=%s">%s</a>\n' $CONFIGS)</pre>
   1.278 @@ -953,7 +953,7 @@
   1.279  				fi ;;
   1.280  		esac
   1.281  
   1.282 -		cat << EOT
   1.283 +		cat <<EOT
   1.284  <h2>$(_ 'Administration')</h2>
   1.285  
   1.286  <p>$(_ 'TazPkg administration and settings')</p>
   1.287 @@ -1020,7 +1020,7 @@
   1.288  		[ "$cache_files" == 0 ] && cache_size="0K"
   1.289  		mirror=$(cat $PKGS_DB/mirror)
   1.290  		default_mirror=${mirror%/packages/*}
   1.291 -		cat << EOT
   1.292 +		cat <<EOT
   1.293  <section>
   1.294  	<header>$(_ 'Packages cache')</header>
   1.295  	<form class="wide">
   1.296 @@ -1041,13 +1041,13 @@
   1.297  			if [ $i != $PKGS_DB/mirrors ]; then
   1.298  				echo "<h4>$(_ 'Repository: %s' "$(repo_name $(dirname $i))")</h4>"
   1.299  			fi
   1.300 -			cat << EOT
   1.301 +			cat <<EOT
   1.302  	<form class="wide">
   1.303  		<input type="hidden" name="admin" value="select-mirror"/>
   1.304  		<table class="wide zebra">
   1.305  EOT
   1.306  			while read line; do
   1.307 -				cat << EOT
   1.308 +				cat <<EOT
   1.309  			<tr>
   1.310  				<td>
   1.311  					<input type="radio" name="mirror" id="$line" value="$line" onchange="this.form.submit()"
   1.312 @@ -1058,7 +1058,7 @@
   1.313  			</tr>
   1.314  EOT
   1.315  			done < $i
   1.316 -			cat << EOT
   1.317 +			cat <<EOT
   1.318  		</table>
   1.319  	</form>
   1.320  
   1.321 @@ -1071,7 +1071,7 @@
   1.322  	</form>
   1.323  EOT
   1.324  		done
   1.325 -		cat << EOT
   1.326 +		cat <<EOT
   1.327  </section>
   1.328  
   1.329  
   1.330 @@ -1079,7 +1079,7 @@
   1.331  	<header>$(_ 'Private repositories')</header>
   1.332  EOT
   1.333  		if [ -n "$(ls $PKGS_DB/undigest 2> /dev/null)" ]; then
   1.334 -			cat << EOT
   1.335 +			cat <<EOT
   1.336  	<table class="wide zebra">
   1.337  EOT
   1.338  			ls $PKGS_DB/undigest 2> /dev/null | while read repo ; do
   1.339 @@ -1090,12 +1090,12 @@
   1.340  		</tr>
   1.341  EOT
   1.342  			done
   1.343 -			cat << EOT
   1.344 +			cat <<EOT
   1.345  	</table>
   1.346  EOT
   1.347  		fi
   1.348  
   1.349 -		cat << EOT
   1.350 +		cat <<EOT
   1.351  	<form class="wide">
   1.352  		<table>
   1.353  			<tr><td>$(_ 'Name')</td><td><input type="text" name="repository" size="10"/></td></tr>
   1.354 @@ -1275,10 +1275,10 @@
   1.355  		search_form; sidebar
   1.356  
   1.357  		tag=$(GET tag)
   1.358 -		cat << EOT
   1.359 +		cat <<EOT
   1.360  <h2 data-icon="tag">$(_ 'Tag "%s"' $tag)</h2>
   1.361  EOT
   1.362 -		[ "$REMOTE_USER" == "root" ] && cat << EOT
   1.363 +		[ "$REMOTE_USER" == "root" ] && cat <<EOT
   1.364  <section>
   1.365  	<div>$(_ 'Selected packages:') <span id="countSelected"></span></div>
   1.366  	<footer>
   1.367 @@ -1287,13 +1287,13 @@
   1.368  	</footer>
   1.369  </section>
   1.370  EOT
   1.371 -		cat << EOT
   1.372 +		cat <<EOT
   1.373  <form id="pkglist" class="wide">
   1.374  EOT
   1.375  		for i in $(repo_list ""); do
   1.376  			show_list all
   1.377  		done
   1.378 -		cat << EOT
   1.379 +		cat <<EOT
   1.380  </form>
   1.381  <script type="text/javascript">window.onscroll = scrollHandler; setCountSelPkgs();</script>
   1.382  EOT
   1.383 @@ -1306,7 +1306,7 @@
   1.384  		#
   1.385  		search_form; sidebar
   1.386  
   1.387 -		cat << EOT
   1.388 +		cat <<EOT
   1.389  <h2>$(_ 'Blocked packages list')</h2>
   1.390  
   1.391  <section>
   1.392 @@ -1326,7 +1326,7 @@
   1.393  				printf "<tr><td><input type=\"checkbox\" name=\"pkg\" value=\"%s\"><a data-icon=\"pkgib\" href=\"?info=%s\">%s</a></td><td>%s</td><td>%s</td><td><a href=\"%s\"></a></td></tr>\n", $1, gensub(/\+/, "%2B", "g", $1), $1, $2, $4, $5
   1.394  			}' $PKGS_DB/installed.info
   1.395  		done
   1.396 -		cat << EOT
   1.397 +		cat <<EOT
   1.398  		</tbody>
   1.399  	</table>
   1.400  </form>
   1.401 @@ -1341,13 +1341,13 @@
   1.402  		#
   1.403  		search_form; sidebar
   1.404  
   1.405 -		cat << EOT
   1.406 +		cat <<EOT
   1.407  <form id="actions2">
   1.408  EOT
   1.409  		fslink=$(readlink $PKGS_DB/fslink)
   1.410  		[ -n "$fslink" -a -d "$fslink/$INSTALLED" ] && show_button linkable
   1.411  		show_button recharge up admin
   1.412 -		cat << EOT
   1.413 +		cat <<EOT
   1.414  </form>
   1.415  
   1.416  <section>

     2.1 --- a/tazpkg	Mon Apr 13 01:42:49 2015 +0300
     2.2 +++ b/tazpkg	Mon Apr 13 11:53:19 2015 +0300
     2.3 @@ -67,7 +67,7 @@
     2.4  
     2.5  
     2.6  # If category is not one of those translated in native language, keep it
     2.7 -# untranslated. This allows both native and english language support.
     2.8 +# untranslated. This allows both native and English language support.
     2.9  # This also supports custom categories.
    2.10  # And now we support spaces in translated categories
    2.11  
    2.12 @@ -79,7 +79,7 @@
    2.13  
    2.14  
    2.15  #
    2.16 -# TazPKG output functions
    2.17 +# TazPkg output functions
    2.18  #
    2.19  
    2.20  
    2.21 @@ -144,7 +144,7 @@
    2.22  # Print the usage.
    2.23  
    2.24  usage () {
    2.25 -	cat << EOT
    2.26 +	cat <<EOT
    2.27  
    2.28  $(_ 'SliTaz package manager - Version: %s' $(colorize 34 $VERSION))
    2.29  
    2.30 @@ -169,7 +169,7 @@
    2.31       search-pkgname		$(_ 'Search on mirror for package having a particular file')
    2.32  -sf  search-file		$(_ 'Search for file in all installed packages files')
    2.33  
    2.34 -     get				$(_ 'Download a package into the current directory')
    2.35 +-g   get				$(_ 'Download a package into the current directory')
    2.36  -gi  get-install		$(_ 'Download and install a package from the mirror')
    2.37       get-install-list	$(_ 'Download and install a list of packages from the mirror')
    2.38  -i   install			$(_ 'Install a local package')
    2.39 @@ -184,7 +184,7 @@
    2.40       repack				$(_ 'Create a package archive from an installed package')
    2.41       repack-config		$(_ 'Create a package archive with configuration files')
    2.42       recompress			$(_ 'Rebuild a package with a better compression ratio')
    2.43 -     block|unblock		$(_ 'Block an installed package version or unblock it for upgrade')
    2.44 +-b|u block|unblock		$(_ 'Block an installed package version or unblock it for upgrade')
    2.45       check				$(_ 'Verify consistency of installed packages')
    2.46  
    2.47       add-flavor			$(_ 'Install the flavor list of packages')
    2.48 @@ -212,7 +212,7 @@
    2.49  
    2.50  
    2.51  usage_up() {
    2.52 -	cat << EOT
    2.53 +	cat <<EOT
    2.54  $(emsg "<b>$(_ 'Usage for command up:')</b>") tazpkg up [$(_ 'option')]
    2.55  
    2.56   * $(longline "$(_ 'Without options run in interactive mode and ask before install')")
    2.57 @@ -2533,7 +2533,7 @@
    2.58  		_ 'Check completed.'; echo ;;
    2.59  
    2.60  
    2.61 -	block)
    2.62 +	block|-b)
    2.63  		# Add a pkg name to the list of blocked packages.
    2.64  		check_root $@
    2.65  		check_for_package_on_cmdline
    2.66 @@ -2552,7 +2552,7 @@
    2.67  		newline ;;
    2.68  
    2.69  
    2.70 -	unblock)
    2.71 +	unblock|-u)
    2.72  		# Remove a pkg name from the list of blocked packages.
    2.73  		check_root $@
    2.74  		check_for_package_on_cmdline
    2.75 @@ -2593,7 +2593,7 @@
    2.76  		newline ;;
    2.77  
    2.78  
    2.79 -	get)
    2.80 +	get|-g)
    2.81  		# Download a package with wget.
    2.82  		check_root $@
    2.83  		check_for_package_on_cmdline
    2.84 @@ -2879,7 +2879,7 @@
    2.85  					SUGGESTED=$(echo -n $SUGGESTED | sed "s/$s//")
    2.86  				done
    2.87  				fi
    2.88 -				cat << EOT
    2.89 +				cat <<EOT
    2.90  $(boldify $(echo $PACKAGE):) $SUGGESTED
    2.91  EOT
    2.92  			fi

     3.1 --- a/tazpkg-box	Mon Apr 13 01:42:49 2015 +0300
     3.2 +++ b/tazpkg-box	Mon Apr 13 11:53:19 2015 +0300
     3.3 @@ -4,7 +4,7 @@
     3.4  # patch to extract a TazPkg file but not Thunar and other FM. TazPkgBox tries
     3.5  # to follow freedesktop standards.
     3.6  #
     3.7 -# Copyright (C) 2011-2014 SliTaz GNU/Linux - GNU GPL v2
     3.8 +# Copyright (C) 2011-2015 SliTaz GNU/Linux - GNU GPL v2
     3.9  #
    3.10  # Authors: Christophe Lincoln <pankso@slitaz.org>
    3.11  #
    3.12 @@ -23,7 +23,7 @@
    3.13  
    3.14  
    3.15  usage() {
    3.16 -	cat << EOT
    3.17 +	cat <<EOT
    3.18  $(_ 'Usage:') $(basename $0) [actions|URL] [$(_ 'package')]
    3.19  EOT
    3.20  }
author	Aleksej Bobylev <al.bobylev@gmail.com>
date	Mon Apr 13 11:53:19 2015 +0300 (2015-04-13)
parents	8c9c6461d540
children	c389814e4f9a
files	tazpanel/pkgs.cgi tazpkg tazpkg-box