diff options
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 15 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/echo/client.scm.in (renamed from examples/echo/client.scm) | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/echo/server.scm.in (renamed from examples/echo/server.scm) | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/sssh.scm.in (renamed from examples/sssh.scm) | 3 | ||||
| -rw-r--r--[-rwxr-xr-x] | examples/ssshd.scm.in (renamed from examples/ssshd.scm) | 3 |
7 files changed, 34 insertions, 5 deletions
@@ -1,5 +1,15 @@ 2014-03-01 Artyom Poptsov <poptsov.artyom@gmail.com> + * examples/ssshd.scm: Rename to `examples/ssshd.scm.in'. + * examples/sssh.scm: Rename to `examples/sssh.scm.in'. + * examples/echo/client.scm: Rename to + `examples/echo/client.scm.in'. + * examples/echo/server.scm: Rename to + `examples/echo/server.scm.in'. + * examples/Makefile.am: Substitute `@GUILE@' with the actual path + to Guile interpreter in *.in files. + * NEWS: Update. + * ssh/server-func.c (server-accept): Throw `guile-ssh-error' on error. * examples/ssshd.scm (main): Handle `guile-ssh-error' on @@ -12,6 +12,8 @@ Copyright (C) Artyom V. Poptsov <poptsov.artyom@gmail.com> Compile Guile modules and install compiled files if GNU Guile 2.0.x is available. ** Update examples +*** Use actual path to Guile interpreter in the shebang + Executables will be produced during building of the Guile-SSH. *** Add new command line options for `examples/ssshd.scm'. ssshd now takes `--ssh-debug' and `--pid-file' option. *** ssshd now stores the PID in a file diff --git a/examples/Makefile.am b/examples/Makefile.am index 77bbcde..6ced691 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -19,4 +19,17 @@ examplesdir = $(pkgdatadir)/examples examples_echodir = $(pkgdatadir)/examples/echo dist_examples_DATA = README sssh.scm ssshd.scm -dist_examples_echo_DATA = echo/*.scm +dist_examples_echo_DATA = echo/server.scm echo/client.scm + +substitute = sed -e 's,[@]GUILE[@],$(GUILE),g' + +SUFFIXES = .in + +.in: + $(substitute) "$^" > "$@.tmp" && \ + chmod +x "$@.tmp" && \ + mv "$@.tmp" "$@" + +CLEANFILES = \ + sssh.scm ssshd.scm \ + echo/server.scm echo/client.scm diff --git a/examples/echo/client.scm b/examples/echo/client.scm.in index 3c5bfd5..ac6605c 100755..100644 --- a/examples/echo/client.scm +++ b/examples/echo/client.scm.in @@ -1,5 +1,6 @@ -#!/usr/bin/guile \ +#!@GUILE@ \ --debug -e main +# aside from this initial boilerplate, this is actually -*- scheme -*- code !# ;;; client.scm -- Echo client example. diff --git a/examples/echo/server.scm b/examples/echo/server.scm.in index 1921cd9..1f41265 100755..100644 --- a/examples/echo/server.scm +++ b/examples/echo/server.scm.in @@ -1,5 +1,6 @@ -#!/usr/bin/guile \ +#!@GUILE@ \ --debug -e main -s +# aside from this initial boilerplate, this is actually -*- scheme -*- code !# ;;; client.scm -- Echo server example. diff --git a/examples/sssh.scm b/examples/sssh.scm.in index e95e037..7d55f84 100755..100644 --- a/examples/sssh.scm +++ b/examples/sssh.scm.in @@ -1,5 +1,6 @@ -#!/usr/bin/guile \ +#!@GUILE@ \ --debug -e main +# aside from this initial boilerplate, this is actually -*- scheme -*- code !# ;;; sssh.scm -- Scheme Secure Shell. diff --git a/examples/ssshd.scm b/examples/ssshd.scm.in index 9b7045c..71e0f2d 100755..100644 --- a/examples/ssshd.scm +++ b/examples/ssshd.scm.in @@ -1,5 +1,6 @@ -#!/usr/bin/guile \ +#!@GUILE@ \ --debug -e main -s +# aside from this initial boilerplate, this is actually -*- scheme -*- code !# ;;; ssshd.scm -- Scheme Secure Shell Daemon. |