Merge ~racb/git-ubuntu:snap-fixes into git-ubuntu:master

[Robie Basak]

Make Jenkins happy

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:91cb46ecee6f43d4e133bce708ff0e0e0bba24b2
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/526/
Executed test runs:
    SUCCESS: VM Setup
    SUCCESS: Build
    SUCCESS: Unit Tests
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/git-ubuntu-ci/526//rebuild

review: Approve (continuous-integration)

[Bryce Harrington (bryce)]

All looks good, I read through the discussions on the linked bugs and at the snapcraft forum, and this seems like the logical change to make based on those.

I notice there are a few #!/bin/sh scripts, would those need any adjustments?

review: Approve

[Robie Basak (racb)]

Thanks!

On Tue, Jul 07, 2020 at 05:44:40PM -0000, Bryce Harrington wrote:
> I notice there are a few #!/bin/sh scripts, would those need any adjustments?

Calling sh doesn't seem to have any similar issues, so I'm leaving these
for now.

diff --git a/snap-wrappers/wrappers/awk b/snap-wrappers/wrappers/awk
index 24e0591..2d4abb7 100755
--- a/snap-wrappers/wrappers/awk
+++ b/snap-wrappers/wrappers/awk
@@ -1,4 +1,4 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 CORE_SNAP="/snap/core/current"
 CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
diff --git a/snap-wrappers/wrappers/gbp b/snap-wrappers/wrappers/gbp
index 098061d..77145d7 100755
--- a/snap-wrappers/wrappers/gbp
+++ b/snap-wrappers/wrappers/gbp
@@ -1,4 +1,4 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 CORE_SNAP="/snap/core/current"
 CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
diff --git a/snap-wrappers/wrappers/git-merge-changelogs b/snap-wrappers/wrappers/git-merge-changelogs
index d751f45..e78ce69 100755
--- a/snap-wrappers/wrappers/git-merge-changelogs
+++ b/snap-wrappers/wrappers/git-merge-changelogs
@@ -1,4 +1,4 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 set -e
 
diff --git a/snap-wrappers/wrappers/git-reconstruct-changelog b/snap-wrappers/wrappers/git-reconstruct-changelog
index 4b60e79..8fbb9f9 100755
--- a/snap-wrappers/wrappers/git-reconstruct-changelog
+++ b/snap-wrappers/wrappers/git-reconstruct-changelog
@@ -1,4 +1,4 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 set -e
 
diff --git a/snap-wrappers/wrappers/git-ubuntu-man b/snap-wrappers/wrappers/git-ubuntu-man
index 99f99e4..623cdd2 100755
--- a/snap-wrappers/wrappers/git-ubuntu-man
+++ b/snap-wrappers/wrappers/git-ubuntu-man
@@ -1,3 +1,3 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 man -M $SNAP/usr/share/man $@ 2>/dev/null || man $@
diff --git a/snap-wrappers/wrappers/git-ubuntu-self-test b/snap-wrappers/wrappers/git-ubuntu-self-test
index edae48b..699fb59 100755
--- a/snap-wrappers/wrappers/git-ubuntu-self-test
+++ b/snap-wrappers/wrappers/git-ubuntu-self-test
@@ -1,4 +1,4 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 function die() {
     echo "Error:  ${*}" 1>&2
diff --git a/snap-wrappers/wrappers/quilt b/snap-wrappers/wrappers/quilt
index e54a718..ed09371 100755
--- a/snap-wrappers/wrappers/quilt
+++ b/snap-wrappers/wrappers/quilt
@@ -1,4 +1,4 @@
-#!/snap/core/current/bin/bash
+#!/snap/git-ubuntu/current/bin/bash
 
 CORE_SNAP="/snap/core/current"
 CORE_SNAP_PATH="$CORE_SNAP/usr/local/sbin:$CORE_SNAP/usr/local/bin:$CORE_SNAP/usr/sbin:$CORE_SNAP/usr/bin:$CORE_SNAP/sbin:$CORE_SNAP/bin"
diff --git a/snap-wrappers/wrappers/ssh b/snap-wrappers/wrappers/ssh
 new file mode 100755
index 0000000..92f8b3d
--- /dev/null
+++ b/snap-wrappers/wrappers/ssh
@@ -0,0 +1,7 @@
+#!/snap/git-ubuntu/current/bin/bash
+
+# Use the host's ssh. As an exception to git-ubuntu embedding everything
+# required in the snap, LP: #1871827 showed us that we really depend on the
+# user's ssh configuration on the host and on further thought it is the user's
+# expectation that their host ssh configuration be used.
+exec /usr/bin/ssh "$@"
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 4bf1ec2..a2b16c3 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -364,6 +364,7 @@ parts:
       build-packages:
          - libsystemd-dev
       stage-packages:
+         - bash
          - fakeroot
          - libffi-dev
          - libssl-dev
@@ -418,6 +419,7 @@ parts:
          wrappers/gbp: usr/local/bin/gbp
          wrappers/quilt: usr/local/bin/quilt
          wrappers/awk: usr/local/bin/awk
+         wrappers/ssh: usr/local/bin/ssh
    manpages:
       source: man/
       plugin: dump