Version: 4

3 files changed, 8 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9aefb77874cf..3636b53509fd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,15 @@
 pkgbase = dosh
 	pkgdesc = Docker shell
-	pkgver = 3
-	pkgrel = 3
+	pkgver = 4
+	pkgrel = 1
 	url = https://github.com/gportay/dosh
 	arch = any
 	license = MIT
 	checkdepends = shellcheck
 	makedepends = asciidoctor
 	depends = docker
-	source = https://github.com/gportay/dosh/archive/3.tar.gz
-	source = 0001-Fix-Use-the-content-of-docker-variables-in-an-array.patch
+	source = https://github.com/gportay/dosh/archive/4.tar.gz
 	validpgpkeys = 8F3491E60E62695ED780AC672FA122CA0501CA71
-	sha256sums = 3669ed476311b12b29f87f955e22d2c048f162719b886091d3685d04044733e0
-	sha256sums = 573b7582a174fe0b9e7bfbc29df0e0dce05a7ae1335187af57f9896e34ce247f
+	sha256sums = 1ac2908a28f5bf1f4678d2a60a7363cc0430dd8d658439fb9db80c7da8a80ff0
 
 pkgname = dosh
-
diff --git a/0001-Fix-Use-the-content-of-docker-variables-in-an-array.patch b/0001-Fix-Use-the-content-of-docker-variables-in-an-array.patch
deleted file mode 100644
index 85513dd3da08..000000000000
--- a/0001-Fix-Use-the-content-of-docker-variables-in-an-array.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 0a9bcc1dad64951526dfc6ec2e03f5c7fdf0094d Mon Sep 17 00:00:00 2001
-From: =?utf-8?q?Ga=C3=ABl=20PORTAY?= <gael.portay@collabora.com>
-Date: Tue, 12 May 2020 22:25:16 -0400
-Subject: [PATCH] Fix "Use the content of docker variables in an array"
-
-This fixes commit 179675fdf83ab8fbf890a3eb4d18b14ea568a97d.
-
-This commit applies the changes to the command docker exec and docker
-run.
----
- dosh | 19 +++++++++++++++++--
- 1 file changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/dosh b/dosh
-index 9906d80..bdfcf8d 100755
---- a/dosh
-+++ b/dosh
-@@ -506,7 +506,14 @@ fi
- # Execute in existing container
- if [[ ${exec:-} ]]
- then
--	run exec "${docker[@]}" exec "${opts[@]}" ${DOSH_DOCKER_EXEC_EXTRA_OPTS:-} "$exec" "$DOSHELL" "$@"
-+	# Append extra options if any
-+	read -r -a extraopts < <(echo "${DOSH_DOCKER_EXEC_EXTRA_OPTS:-}")
-+	if [ ${#extraopts[*]} -gt 0 ]
-+	then
-+		opts+=("${extraopts[@]:-}")
-+	fi
-+
-+	run exec "${docker[@]}" exec "${opts[@]}" "$exec" "$DOSHELL" "$@"
- # Run in a new container
- else
- 	opts+=("--env" "DOSHLVL=$((DOSHLVL+1))")
-@@ -515,5 +522,13 @@ else
- 	then
- 		echo "$tag"
- 	fi >&2
--	run exec "${docker[@]}" run "${opts[@]}" ${DOSH_DOCKER_RUN_EXTRA_OPTS:-} "$tag" "$@"
-+
-+	# Append extra options if any
-+	read -r -a extraopts < <(echo "${DOSH_DOCKER_RUN_EXTRA_OPTS:-}")
-+	if [ ${#extraopts[*]} -gt 0 ]
-+	then
-+		opts+=("${extraopts[@]:-}")
-+	fi
-+
-+	run exec "${docker[@]}" run "${opts[@]}" "$tag" "$@"
- fi
--- 
-2.26.2
-
diff --git a/PKGBUILD b/PKGBUILD
index 14a81ad28942..1a956ba67b37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Gaël PORTAY <gael.portay@gmail.com>
 
 pkgname=dosh
-pkgver=3
-pkgrel=3
+pkgver=4
+pkgrel=1
 pkgdesc='Docker shell'
 arch=('any')
 url="https://github.com/gportay/$pkgname"
@@ -10,17 +10,10 @@ license=('MIT')
 depends=('docker')
 makedepends=('asciidoctor')
 checkdepends=('shellcheck')
-source=("https://github.com/gportay/$pkgname/archive/$pkgver.tar.gz"
-        '0001-Fix-Use-the-content-of-docker-variables-in-an-array.patch')
-sha256sums=('3669ed476311b12b29f87f955e22d2c048f162719b886091d3685d04044733e0'
-            '573b7582a174fe0b9e7bfbc29df0e0dce05a7ae1335187af57f9896e34ce247f')
+source=("https://github.com/gportay/$pkgname/archive/$pkgver.tar.gz")
+sha256sums=('1ac2908a28f5bf1f4678d2a60a7363cc0430dd8d658439fb9db80c7da8a80ff0')
 validpgpkeys=('8F3491E60E62695ED780AC672FA122CA0501CA71')
 
-prepare() {
-	cd "$pkgname-$pkgver"
-	patch -p1 -i "$srcdir/0001-Fix-Use-the-content-of-docker-variables-in-an-array.patch"
-}
-
 build() {
 	cd "$pkgname-$pkgver"
 	make doc SHELL="/bin/sh"