Update loadup and medley scripts to use "tag" instead of "branch"; add ability to completely delete tagged loadups rather than just thin them (#2249)
* WIP in changing loadups to tagged nomeclature rather that branch and ability to delete tagged branches as well as thin them. * In loadup and medley scripts, changed the --branch (-br) command line argument to --tag (-tg). Correspondingly changed the MEDLEYDIR/loadups/branches directory to be MEDLEYDIR/loadups/tagged. Separately, added a + parameter to the --thinw and --thinl command line arguments which causes ALL files to be deleted, not just the versioned files. Added a --thin command line argument that is equivalent to --thinw followed by --thinl. Updated the man page to reflect all these changes. * Updated medley script man page to reflect the new tag nomenclature instead of branch nomenclature. * Fix issue#2063 - typo in medley man page * 1) In loadup script made --help (-h) be a synomym of --man (-z). 2) In both loadup and medley scripts added an optional parameter (+) to the --man (z) command line argument that when specified will display the man page without paging - i.e., sets the pager to cat. * Fix Issue#2251 LOADUPSDIRECTORIES settings by the MEDLEYDIR fn now takes into account tagged loadups
This commit is contained in:
@@ -20,9 +20,10 @@ invocation of medley.</p>
|
||||
<dd>
|
||||
<p>Prints out a brief summary of the flags and arguments to medley.</p>
|
||||
</dd>
|
||||
<dt>-z, --man</dt>
|
||||
<dt>-z [+], --man [+]</dt>
|
||||
<dd>
|
||||
<p>Show the man page for medley</p>
|
||||
<p>Show the man page for medley. If the <strong>+</strong> parameter is
|
||||
specified, then no pager is used when displaying the man page.</p>
|
||||
</dd>
|
||||
<dt>-c [<em>FILE</em> | -], --config [<em>FILE</em> | -]</dt>
|
||||
<dd>
|
||||
@@ -101,7 +102,7 @@ virtual display.</p>
|
||||
<dt>-g [<em>WxH</em> | -], --geometry [<em>WxH</em> | -]</dt>
|
||||
<dd>
|
||||
<p>Sets the size of the X Window (or VNC window) that Medley runs in to
|
||||
be Width x Height. (Full X Windows geomtery specification with +X+Y is
|
||||
be Width x Height. (Full X Windows geometry specification with +X+Y is
|
||||
not currently supported).</p>
|
||||
<p>If a value of “-” is given, geometry is set to the default value.</p>
|
||||
<p>If --geometry is not specified but --screensize is, then the window
|
||||
@@ -293,15 +294,15 @@ that detects Xvnc server failures. Setting this flag notifies Medley
|
||||
that very short Medley sessions are possible and the Xvnc error
|
||||
detection needs to be adjusted accordingly.</p>
|
||||
</dd>
|
||||
<dt>-br [<em>BRANCH</em> | -], --branch [<em>BRANCH</em> | -]</dt>
|
||||
<dt>-tg [<em>TAG</em> | -], --tag [<em>TAG</em> | -]</dt>
|
||||
<dd>
|
||||
<p>By default, sysout files are loaded from the MEDLEYDIR/loadups
|
||||
directory. If “--branch <em>BRANCH</em>” is specified, then by default
|
||||
sysout files are loaded from the MEDLEYDIR/loadups/branches/BRANCH
|
||||
directory. The sysouts in these directories are created using a loadups
|
||||
script with the --branch flag set. See the loadup man page. If
|
||||
<em>BRANCH</em> is “-”, then the name of the active git branch for
|
||||
MEDLEYDIR (if any) is used as <em>BRANCH</em>.</p>
|
||||
directory. If “--tag <em>TAG</em>” is specified, then by default sysout
|
||||
files are loaded from the MEDLEYDIR/loadups/tagged/TAG directory. The
|
||||
sysouts in these directories are created using a loadups script with the
|
||||
--tag flag set. See the loadup man page. If <em>TAG</em> is “-”, then
|
||||
the name of the active git branch for MEDLEYDIR (if any) is used as
|
||||
<em>TAG</em>.</p>
|
||||
</dd>
|
||||
</dl>
|
||||
<h2>Other Options</h2>
|
||||
|
||||
@@ -45,8 +45,10 @@ hence MEDLEYDIR is computed on each invocation of medley.
|
||||
-h, --help
|
||||
Prints out a brief summary of the flags and arguments to medley.
|
||||
.TP
|
||||
-z, --man
|
||||
Show the man page for medley
|
||||
-z [+], --man [+]
|
||||
Show the man page for medley.
|
||||
If the \f[B]+\f[R] parameter is specified, then no pager is used when
|
||||
displaying the man page.
|
||||
.TP
|
||||
-c [\f[I]FILE\f[R] | -], --config [\f[I]FILE\f[R] | -]
|
||||
Use \f[I]FILE\f[R] as the config file for this run of Medley.
|
||||
@@ -151,7 +153,7 @@ virtual display.
|
||||
-g [\f[I]WxH\f[R] | -], --geometry [\f[I]WxH\f[R] | -]
|
||||
Sets the size of the X Window (or VNC window) that Medley runs in to be
|
||||
Width x Height.
|
||||
(Full X Windows geomtery specification with +X+Y is not currently
|
||||
(Full X Windows geometry specification with +X+Y is not currently
|
||||
supported).
|
||||
.RS
|
||||
.PP
|
||||
@@ -396,17 +398,16 @@ failures.
|
||||
Setting this flag notifies Medley that very short Medley sessions are
|
||||
possible and the Xvnc error detection needs to be adjusted accordingly.
|
||||
.TP
|
||||
-br [\f[I]BRANCH\f[R] | -], --branch [\f[I]BRANCH\f[R] | -]
|
||||
-tg [\f[I]TAG\f[R] | -], --tag [\f[I]TAG\f[R] | -]
|
||||
By default, sysout files are loaded from the MEDLEYDIR/loadups
|
||||
directory.
|
||||
If \[lq]--branch \f[I]BRANCH\f[R]\[rq] is specified, then by default
|
||||
sysout files are loaded from the MEDLEYDIR/loadups/branches/BRANCH
|
||||
directory.
|
||||
If \[lq]--tag \f[I]TAG\f[R]\[rq] is specified, then by default sysout
|
||||
files are loaded from the MEDLEYDIR/loadups/tagged/TAG directory.
|
||||
The sysouts in these directories are created using a loadups script with
|
||||
the --branch flag set.
|
||||
the --tag flag set.
|
||||
See the loadup man page.
|
||||
If \f[I]BRANCH\f[R] is \[lq]-\[rq], then the name of the active git
|
||||
branch for MEDLEYDIR (if any) is used as \f[I]BRANCH\f[R].
|
||||
If \f[I]TAG\f[R] is \[lq]-\[rq], then the name of the active git branch
|
||||
for MEDLEYDIR (if any) is used as \f[I]TAG\f[R].
|
||||
.SS Other Options
|
||||
.PP
|
||||
\
|
||||
|
||||
Binary file not shown.
@@ -38,8 +38,9 @@ Flags
|
||||
-h, \-\-help
|
||||
: Prints out a brief summary of the flags and arguments to medley.
|
||||
|
||||
-z, \-\-man
|
||||
: Show the man page for medley
|
||||
-z [+], \-\-man [+]
|
||||
: Show the man page for medley. If the **+** parameter is specified, then no pager is used when
|
||||
displaying the man page.
|
||||
|
||||
-c [*FILE* | -], \-\-config [*FILE* | -]
|
||||
: Use *FILE* as the config file for this run of Medley. See information on *CONFIG FILE* below.
|
||||
@@ -106,7 +107,7 @@ than the window, there will be no way to pan to the non-visible parts of the vir
|
||||
|
||||
-g [*WxH* | -], \-\-geometry [*WxH* | -]
|
||||
: Sets the size of the X Window (or VNC window) that Medley runs in to be Width x Height. (Full X Windows
|
||||
geomtery specification with +X+Y is not currently supported).
|
||||
geometry specification with +X+Y is not currently supported).
|
||||
|
||||
If a value of "-" is given, geometry is set to the default value.
|
||||
|
||||
@@ -263,14 +264,13 @@ specified in the Medley file system, not the host Windows file system.
|
||||
will run for a very short time (< a couple of seconds). This can cause issues with medley code that detects Xvnc server failures.
|
||||
Setting this flag notifies Medley that very short Medley sessions are possible and the Xvnc error detection needs to be adjusted accordingly.
|
||||
|
||||
-br [*BRANCH* | -], \-\-branch [*BRANCH* | -]
|
||||
-tg [*TAG* | -], \-\-tag [*TAG* | -]
|
||||
: By default, sysout files are loaded from the MEDLEYDIR/loadups directory.
|
||||
If "\-\-branch *BRANCH*" is specified, then by default sysout files are loaded from the
|
||||
MEDLEYDIR/loadups/branches/BRANCH directory. The sysouts in these directories are created using
|
||||
a loadups script with the \-\-branch flag set. See the loadup man page.
|
||||
If *BRANCH* is "-", then the name of the active git branch for MEDLEYDIR (if any) is used as
|
||||
*BRANCH*.
|
||||
|
||||
If "\-\-tag *TAG*" is specified, then by default sysout files are loaded from the
|
||||
MEDLEYDIR/loadups/tagged/TAG directory. The sysouts in these directories are created using
|
||||
a loadups script with the \-\-tag flag set. See the loadup man page.
|
||||
If *TAG* is "-", then the name of the active git branch for MEDLEYDIR (if any) is used as
|
||||
*TAG*.
|
||||
|
||||
|
||||
Other Options
|
||||
|
||||
Reference in New Issue
Block a user