diff options
author | Colin Watson <cjwatson@debian.org> | 2013-06-13 14:00:21 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2013-06-13 14:00:21 +0100 |
commit | ed1b8fa3b2e14f180b43e6cf3a5896f16e421031 (patch) | |
tree | 57a1acbc5305d8a25f9f63e46dd1a38eb4675218 | |
parent | 074489e1e6e97c75d87750035dbaf8c693e9736e (diff) |
Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and
ssh-argv0.
-rw-r--r-- | debian/changelog | 2 | ||||
-rw-r--r-- | debian/openssh-client.postinst | 3 | ||||
-rw-r--r-- | debian/openssh-client.postrm | 3 | ||||
-rw-r--r-- | debian/openssh-server.postinst | 3 | ||||
-rw-r--r-- | debian/openssh-server.postrm | 3 | ||||
-rw-r--r-- | debian/openssh-server.preinst | 3 | ||||
-rw-r--r-- | debian/ssh-argv0 | 3 |
7 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog index 7ab444385..689f4d420 100644 --- a/debian/changelog +++ b/debian/changelog | |||
@@ -2,6 +2,8 @@ openssh (1:6.2p2-5) UNRELEASED; urgency=low | |||
2 | 2 | ||
3 | * Document consequences of ssh-agent being setgid in ssh-agent(1); see | 3 | * Document consequences of ssh-agent being setgid in ssh-agent(1); see |
4 | #711623. | 4 | #711623. |
5 | * Use 'set -e' rather than '#! /bin/sh -e' in maintainer scripts and | ||
6 | ssh-argv0. | ||
5 | 7 | ||
6 | -- Colin Watson <cjwatson@debian.org> Sat, 08 Jun 2013 22:12:27 +0100 | 8 | -- Colin Watson <cjwatson@debian.org> Sat, 08 Jun 2013 22:12:27 +0100 |
7 | 9 | ||
diff --git a/debian/openssh-client.postinst b/debian/openssh-client.postinst index 85cedc406..978b04a9b 100644 --- a/debian/openssh-client.postinst +++ b/debian/openssh-client.postinst | |||
@@ -1,4 +1,5 @@ | |||
1 | #!/bin/sh -e | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | action="$1" | 4 | action="$1" |
4 | oldversion="$2" | 5 | oldversion="$2" |
diff --git a/debian/openssh-client.postrm b/debian/openssh-client.postrm index 2b29a098b..a3b610ed1 100644 --- a/debian/openssh-client.postrm +++ b/debian/openssh-client.postrm | |||
@@ -1,4 +1,5 @@ | |||
1 | #!/bin/sh -e | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | #DEBHELPER# | 4 | #DEBHELPER# |
4 | 5 | ||
diff --git a/debian/openssh-server.postinst b/debian/openssh-server.postinst index bec99f746..24d9a2c93 100644 --- a/debian/openssh-server.postinst +++ b/debian/openssh-server.postinst | |||
@@ -1,4 +1,5 @@ | |||
1 | #!/bin/sh -e | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | action="$1" | 4 | action="$1" |
4 | oldversion="$2" | 5 | oldversion="$2" |
diff --git a/debian/openssh-server.postrm b/debian/openssh-server.postrm index fdf0802c9..33191522b 100644 --- a/debian/openssh-server.postrm +++ b/debian/openssh-server.postrm | |||
@@ -1,4 +1,5 @@ | |||
1 | #!/bin/sh -e | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | #DEBHELPER# | 4 | #DEBHELPER# |
4 | 5 | ||
diff --git a/debian/openssh-server.preinst b/debian/openssh-server.preinst index 559693f7b..9fb5d350e 100644 --- a/debian/openssh-server.preinst +++ b/debian/openssh-server.preinst | |||
@@ -1,4 +1,5 @@ | |||
1 | #!/bin/sh -e | 1 | #!/bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | action=$1 | 4 | action=$1 |
4 | version=$2 | 5 | version=$2 |
diff --git a/debian/ssh-argv0 b/debian/ssh-argv0 index 67599aec2..37506a4d7 100644 --- a/debian/ssh-argv0 +++ b/debian/ssh-argv0 | |||
@@ -1,4 +1,5 @@ | |||
1 | #! /bin/sh -e | 1 | #! /bin/sh |
2 | set -e | ||
2 | 3 | ||
3 | # Copyright (c) 2001 Jonathan Amery. | 4 | # Copyright (c) 2001 Jonathan Amery. |
4 | # | 5 | # |