aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xscripts/cross-test-ssh.sh26
2 files changed, 15 insertions, 19 deletions
diff --git a/ChangeLog b/ChangeLog
index fdb2ccb1ab..16fa8ac986 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-11-03 Andreas Schwab <schwab@linux-m68k.org>
+
+ * scripts/cross-test-ssh.sh (command): Use newlines to separate
+ commands. Quote $PWD.
+ (blacklist_exports): Don't use remove_newlines. Replace "declare
+ -x" by "export".
+ (remove_newlines): Remove.
+
2012-11-02 H.J. Lu <hongjiu.lu@intel.com>
* stdlib/Makefile (headers): Add bits/stdlib-float.h.
diff --git a/scripts/cross-test-ssh.sh b/scripts/cross-test-ssh.sh
index f09c98ec11..51b0da924a 100755
--- a/scripts/cross-test-ssh.sh
+++ b/scripts/cross-test-ssh.sh
@@ -108,37 +108,25 @@ bourne_quote ()
done
}
-# Remove unnecessary newlines from a Bourne shell command sequence.
-remove_newlines ()
-{
- sed -n \
- -e '1h' \
- -e '2,$H' \
- -e '${g
- s/\([^\]\)\n/\1; /g
- p
- }'
-}
-
# Unset all variables from the blacklist. Then echo all exported
-# variables. The 'export -p' command adds backslashes for environment
-# variables which contain newlines.
+# variables.
blacklist_exports ()
{
- (unset ${env_blacklist}; export -p) | remove_newlines
+ (unset ${env_blacklist}; export -p) | sed 's/^declare -x/export/'
}
-# Produce properly quoted Bourne shell arguments for 'env' to carry
-# over the current environment, less blacklisted variables.
+# Produce commands to carry over the current environment, less blacklisted
+# variables.
exports="$(blacklist_exports)"
-exports="${exports:+${exports}; }"
# Transform the current argument list into a properly quoted Bourne shell
# command string.
command="$(bourne_quote "$@")"
# Add commands to set environment variables and the current directory.
-command="${exports}cd $PWD; ${command}"
+command="${exports}
+cd $(bourne_quote "$PWD")
+${command}"
# HOST's sshd simply concatenates its arguments with spaces and
# passes them to some shell. We want to force the use of /bin/sh,