From 7c0ca69d2510691fb2f0644a3146e9d9d2d90d0a Mon Sep 17 00:00:00 2001
From: "jan.nijtmans" <nijtmans@users.sourceforge.net>
Date: Tue, 22 Nov 2011 16:53:14 +0000
Subject: [Bug 1945073]: Demo square.tcl cannot run; need package tktest
---
ChangeLog | 14 +++++++++++++-
doc/wish.1 | 2 +-
library/demos/hello | 2 +-
library/demos/rmt | 2 +-
library/demos/square | 2 +-
library/demos/tcolor | 2 +-
library/demos/timer | 2 +-
library/demos/widget | 2 +-
unix/Makefile.in | 4 ++++
win/Makefile.in | 6 +++++-
10 files changed, 29 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index a969a2b..39f028a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2011-11-22 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * doc/wish.1: Use the same shebang comment everywhere.
+ * library/demos/hello
+ * library/demos/rmt
+ * library/demos/square
+ * library/demos/tcolor
+ * library/demos/timer
+ * library/demos/widget
+ * unix/Makefile.in: [Bug 1945073]: Demo square.tcl
+ * win/Makefile.in: cannot run; need package tktest
+
2011-11-17 Jan Nijtmans <nijtmans@users.sf.net>
* doc/pack.n: Fix the escaping of leading dots in lines that start with
@@ -17,7 +29,7 @@
2011-09-26 Jan Nijtmans <nijtmans@users.sf.net>
- * win/rules.vc: Supporrt Visual Studio 11
+ * win/rules.vc: Support Visual Studio 11
2011-09-06 Jan Nijtmans <nijtmans@users.sf.net>
diff --git a/doc/wish.1 b/doc/wish.1
index 20d54e2..5724062 100644
--- a/doc/wish.1
+++ b/doc/wish.1
@@ -147,7 +147,7 @@ following three lines:
.CS
\fB#!/bin/sh
# the next line restarts using wish \e
-exec wish "$0" "$@"\fR
+exec wish "$0" ${1+"$@"}\fR
.CE
This approach has three advantages over the approach in the previous
paragraph. First, the location of the \fBwish\fR binary doesn't have
diff --git a/library/demos/hello b/library/demos/hello
index 42aef2d..b9823f6 100644
--- a/library/demos/hello
+++ b/library/demos/hello
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish "$0" ${1+"$@"}
# hello --
# Simple Tk script to create a button that prints "Hello, world".
diff --git a/library/demos/rmt b/library/demos/rmt
index 3484744..423c4a6 100644
--- a/library/demos/rmt
+++ b/library/demos/rmt
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish "$0" ${1+"$@"}
# rmt --
# This script implements a simple remote-control mechanism for
diff --git a/library/demos/square b/library/demos/square
index 5b5ca24..ca7b42a 100644
--- a/library/demos/square
+++ b/library/demos/square
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish "$0" ${1+"$@"}
# square --
# This script generates a demo application containing only a "square"
diff --git a/library/demos/tcolor b/library/demos/tcolor
index d5fa233..4dd61bb 100644
--- a/library/demos/tcolor
+++ b/library/demos/tcolor
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish "$0" ${1+"$@"}
# tcolor --
# This script implements a simple color editor, where you can
diff --git a/library/demos/timer b/library/demos/timer
index cfa3651..320cd0e 100644
--- a/library/demos/timer
+++ b/library/demos/timer
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish "$0" ${1+"$@"}
# timer --
# This script generates a counter with start and stop buttons.
diff --git a/library/demos/widget b/library/demos/widget
index f99760e..d4ec511 100644
--- a/library/demos/widget
+++ b/library/demos/widget
@@ -1,6 +1,6 @@
#!/bin/sh
# the next line restarts using wish \
-exec wish "$0" "$@"
+exec wish "$0" ${1+"$@"}
# widget --
# This script demonstrates the various widgets provided by Tk,
diff --git a/unix/Makefile.in b/unix/Makefile.in
index 3af3317..27bbb19 100644
--- a/unix/Makefile.in
+++ b/unix/Makefile.in
@@ -724,7 +724,11 @@ install-demos:
done;
@for i in $(DEMOPROGS); \
do \
+ if test $$i = "square"; then \
+ rm -f $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ else \
chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ fi; \
done;
@echo "Installing demo images";
@for i in $(TOP_DIR)/library/demos/images/*; \
diff --git a/win/Makefile.in b/win/Makefile.in
index 71e04e9..9304b43 100644
--- a/win/Makefile.in
+++ b/win/Makefile.in
@@ -500,13 +500,17 @@ install-demos:
@for i in $(ROOT_DIR)/library/demos/*; \
do \
if [ -f $$i ] ; then \
- sed -e '3 s|exec $(WISH)|exec $(WISH)|' \
+ sed -e '3 s|exec wish|exec wish$(VER)|' \
$$i > $(SCRIPT_INSTALL_DIR)/demos/`basename $$i`; \
fi; \
done;
@for i in $(DEMOPROGS); \
do \
+ if test $$i = "square"; then \
+ rm -f $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ else \
chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
+ fi; \
done;
@echo "Installing demo images";
@for i in $(ROOT_DIR)/library/demos/images/*; \
--
cgit v0.12