From 26197fc232d7c4a305f38e7b8a27654abb4e0e9b Mon Sep 17 00:00:00 2001
From: Laurent Bercot
Date: Fri, 16 Mar 2018 12:29:37 +0000
Subject: Remove import, prepare for 2.5.0.0
---
doc/el_substitute.html | 1 -
doc/fdswap.html | 2 +-
doc/forbacktickx.html | 2 +-
doc/import.html | 47 -----------------------------------------------
doc/index.html | 5 ++---
doc/multisubstitute.html | 7 +++----
doc/quine-prj-3.txt | 4 ++--
doc/upgrade.html | 7 +++++++
8 files changed, 16 insertions(+), 59 deletions(-)
delete mode 100644 doc/import.html
(limited to 'doc')
diff --git a/doc/el_substitute.html b/doc/el_substitute.html
index 6b72321..84b1985 100644
--- a/doc/el_substitute.html
+++ b/doc/el_substitute.html
@@ -36,7 +36,6 @@ via substitution commands, namely:
- define
- - import
- importas
- elglob
- elgetpositionals
diff --git a/doc/fdswap.html b/doc/fdswap.html
index cc055de..28e62bb 100644
--- a/doc/fdswap.html
+++ b/doc/fdswap.html
@@ -30,7 +30,7 @@ executes a program.
-fdswaps swaps file descriptors numbered fd1 and
+fdswap swaps file descriptors numbered fd1 and
fd2, then execs into prog with its arguments.
diff --git a/doc/forbacktickx.html b/doc/forbacktickx.html
index e116be6..9cbcd98 100644
--- a/doc/forbacktickx.html
+++ b/doc/forbacktickx.html
@@ -76,7 +76,7 @@ split x.
Notes
- - You can start loop... with "import -u variable"
+
- You can start loop... with "importas -u variable variable"
to perform variable substitution.
- forbacktickx is now implemented as a wrapper around the
pipeline and
diff --git a/doc/import.html b/doc/import.html
deleted file mode 100644
index 8efcdd1..0000000
--- a/doc/import.html
+++ /dev/null
@@ -1,47 +0,0 @@
-
-
-
-
-
- execline: the import program
-
-
-
-
-
-
-
-execline
-Software
-skarnet.org
-
-
- The import program
-
-
-import replaces an environment variable name with its value,
-then executes another program.
-
-
- Interface
-
-
- import [ -i | -D default ] [ -u ] [ -s ] [ -C | -c ] [ -n ] [ -d delim ] envvar prog...
-
-
-
- - import behaves exactly as
-importas envvar envvar.
-
-
- Notes
-
-
- - Starting in execline-2.5.0.0, the import command is
-marked as obsolescent; it will disappear in a future version of execline.
-It is recommended to use the importas
-command instead.
-
-
-
-
diff --git a/doc/index.html b/doc/index.html
index aabda00..b730778 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -51,7 +51,7 @@ shell's syntax, and has no security issues.
- A POSIX-compliant system with a standard C development environment
- GNU make, version 3.81 or later.
- skalibs version
-2.6.2.0 or later. It's a build-time requirement. It's also a run-time
+2.6.4.0 or later. It's a build-time requirement. It's also a run-time
requirement if you link against the shared version of the skalibs
library.
@@ -66,7 +66,7 @@ library.
Download
- - The current released version of execline is 2.3.0.4.
+ - The current released version of execline is 2.5.0.0.
- Alternatively, you can checkout a copy of the
execline
git repository:
@@ -167,7 +167,6 @@ to your installation: the shebang lines for your system might be something like
Options
- - If an import or importas directive was given with the
+
- If an importas directive was given with the
-i option, and the looked up variable is undefined,
multisubstitute will exit 100.
@@ -73,7 +72,7 @@ to learn about the syntax of each substitution command.
#!/command/execlineb
export A wrong
define B ${A}
- import A
+ importas A A
echo ${B}
@@ -88,7 +87,7 @@ to learn about the syntax of each substitution command.
multisubstitute
{
define B ${A}
- import A
+ importas A A
}
echo ${B}
diff --git a/doc/quine-prj-3.txt b/doc/quine-prj-3.txt
index e5b5708..799810e 100644
--- a/doc/quine-prj-3.txt
+++ b/doc/quine-prj-3.txt
@@ -4,10 +4,10 @@ define e ${q}${E}${q}
export E $e
define q ${b}${q}
define b ${b}${b}
-import E
+importas E E
echo $e"
export E $e
define q \"
define b \\
-import E
+importas E E
echo $e
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 0c90b8a..861d7e8 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,13 @@
What has changed in execline
+ in 2.5.0.0
+
+
+ - skalibs dependency bumped to 2.6.4.0
+ - The import command has been removed.
+
+
in 2.3.0.4