Menu
▾
▴
[Fvwm-crystal-commits] SF.net SVN: fvwm-crystal:[1052]
|
From: <dom...@us...> - 2020-12-03 00:38:35
|
Revision: 1052
http://sourceforge.net/p/fvwm-crystal/code/1052
Author: dominique_libre
Date: 2020-12-03 00:38:27 +0000 (Thu, 03 Dec 2020)
Log Message:
-----------
Fix startup in debug mode
Modified Paths:
--------------
ChangeLog
asciidoc/fvwm-crystal
bin/fvwm-crystal
doc/html/fvwm-crystal.html
man/fvwm-crystal.1
Modified: ChangeLog
===================================================================
--- ChangeLog 2020-12-02 23:25:17 UTC (rev 1051)
+++ ChangeLog 2020-12-03 00:38:27 UTC (rev 1052)
@@ -5,7 +5,7 @@
mercredi 2 décembre 2020
bin/fvwm-crystal: add initial support for fvwm3;
- fvwm3 debug mode is supported if $FVWM_DEBUG is set to a non empty value
+ fvwm3 debug mode is supported if $FVWMCRYSTAL_DEBUG is set to a non empty value
at startup; if $FVWM_LOGFILE is not set, the log file will be ~/.fvwm-crystal.log.
fvwm/scripts/launchwm: add fvwm3 and fvwm2 support. Each fvwm variant will
use its own FVWM_USERDIR path:
Modified: asciidoc/fvwm-crystal
===================================================================
--- asciidoc/fvwm-crystal 2020-12-02 23:25:17 UTC (rev 1051)
+++ asciidoc/fvwm-crystal 2020-12-03 00:38:27 UTC (rev 1052)
@@ -72,7 +72,7 @@
When fvwm3 is in use, the following variables can be used:
-*FVWM-CRYSTAL_DEBUG* set fvwm3 in debug mode when set to a non empty value (default: not set). You don't need to redirect the errors into a file, fvwm3 will do it for you.
+*FVWMCRYSTAL_DEBUG* set fvwm3 in debug mode when set to a non empty value (default: not set). You don't need to redirect the errors into a file, fvwm3 will do it for you.
*FVWM_LOGFILE* set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).
Modified: bin/fvwm-crystal
===================================================================
--- bin/fvwm-crystal 2020-12-02 23:25:17 UTC (rev 1051)
+++ bin/fvwm-crystal 2020-12-03 00:38:27 UTC (rev 1052)
@@ -22,6 +22,7 @@
fi
done
fi
+FVWM_EXEC=`basename ${FVWM_EXEC}`
if [ "x${FVWM_EXEC}" == "x" ]; then
echo 'No fvwm, fvwm2 or fvwm3 executable found in $PATH.'
echo "Please adjust your PATH accordingly or install fvwm."
@@ -56,9 +57,9 @@
fi
# Where to write the log when fvwm3 is in debug mode
if [ "${FVWM_EXEC}" == "fvwm3" ]; then
- if [ "x${FVWM_LOGFILE}" == "x" ]; then
- FVWM_LOGFILE="${HOME}/.fvwm-crystal.log"
- export FVWM_LOGFILE
+ if [ "x${FVWM3_LOGFILE}" == "x" ]; then
+ FVWM3_LOGFILE="${HOME}/.fvwm-crystal.log"
+ export FVWM3_LOGFILE
fi
fi
#
@@ -119,12 +120,12 @@
#echo "exec fvwm -f $configfile $@"
#exec fvwm -f $configfile $@
-if [ "x${FVWM-CRYSTAL_DEBUG}" == "x" ]; then
+if [ "x${FVWMCRYSTAL_DEBUG}" == "x" ]; then
echo "Fvwm-Crystal starting using ${FVWM_EXEC}."
exec ${FVWM_EXEC} -f $configfile $@
else
if [ "${FVWM_EXEC}" == "fvwm3" ]; then
- echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM_LOGFILE}."
+ echo "Fvwm-Crystal starting using ${FVWM_EXEC} in debug mode, the log file is ${FVWM3_LOGFILE}."
exec ${FVWM_EXEC} -v -f $configfile $@
else
echo "Debug mode is not supported by ${FVWM_EXEC}. It print all errors to stderr."
Modified: doc/html/fvwm-crystal.html
===================================================================
--- doc/html/fvwm-crystal.html 2020-12-02 23:25:17 UTC (rev 1051)
+++ doc/html/fvwm-crystal.html 2020-12-03 00:38:27 UTC (rev 1052)
@@ -802,7 +802,7 @@
<pre><code>startx</code></pre>
</div></div>
<div class="paragraph"><p>When fvwm3 is in use, the following variables can be used:</p></div>
-<div class="paragraph"><p><strong>FVWM-CRYSTAL_DEBUG</strong> set fvwm3 in debug mode when set to a non empty value (default: not set). You don’t need to redirect the errors into a file, fvwm3 will do it for you.</p></div>
+<div class="paragraph"><p><strong>FVWMCRYSTAL_DEBUG</strong> set fvwm3 in debug mode when set to a non empty value (default: not set). You don’t need to redirect the errors into a file, fvwm3 will do it for you.</p></div>
<div class="paragraph"><p><strong>FVWM_LOGFILE</strong> set fvwm3 log file when in debug mode (default: ~/.fvwm-crystal.log).</p></div>
<div class="sect2">
<h3 id="_first_start">First Start</h3>
@@ -1444,7 +1444,7 @@
<div id="footer">
<div id="footer-text">
Last updated
- 2020-12-02 23:31:08 CET
+ 2020-12-03 01:36:23 CET
</div>
</div>
</body>
Modified: man/fvwm-crystal.1
===================================================================
--- man/fvwm-crystal.1 2020-12-02 23:25:17 UTC (rev 1051)
+++ man/fvwm-crystal.1 2020-12-03 00:38:27 UTC (rev 1052)
@@ -2,12 +2,12 @@
.\" Title: fvwm-crystal
.\" Author: [see the "AUTHORS" section]
.\" Generator: DocBook XSL Stylesheets v1.79.1 <http://docbook.sf.net/>
-.\" Date: 12/02/2020
+.\" Date: 12/03/2020
.\" Manual: FVWM-Crystal
.\" Source: fvwm-crystal 3.7.0
.\" Language: English
.\"
-.TH "FVWM\-CRYSTAL" "1" "12/02/2020" "fvwm\-crystal 3\&.7\&.0" "FVWM\-Crystal"
+.TH "FVWM\-CRYSTAL" "1" "12/03/2020" "fvwm\-crystal 3\&.7\&.0" "FVWM\-Crystal"
.\" -----------------------------------------------------------------
.\" * Define some portability stuff
.\" -----------------------------------------------------------------
@@ -127,7 +127,7 @@
.sp
When fvwm3 is in use, the following variables can be used:
.sp
-\fBFVWM\-CRYSTAL_DEBUG\fR set fvwm3 in debug mode when set to a non empty value (default: not set)\&. You don\(cqt need to redirect the errors into a file, fvwm3 will do it for you\&.
+\fBFVWMCRYSTAL_DEBUG\fR set fvwm3 in debug mode when set to a non empty value (default: not set)\&. You don\(cqt need to redirect the errors into a file, fvwm3 will do it for you\&.
.sp
\fBFVWM_LOGFILE\fR set fvwm3 log file when in debug mode (default: ~/\&.fvwm\-crystal\&.log)\&.
.SS "First Start"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
