From 3d05515c49ed2b23512ad4fac462f00448bdcb37 Mon Sep 17 00:00:00 2001
From: Komail Kanjee <kkanjee@eeng.pro>
Date: Sun, 27 Feb 2022 23:37:46 -0500
Subject: [PATCH] Replacing #!/usr/bin/with-contenv with
 #!/command/with-contenv

* Change is required by upgrade procedure from 2.x to 3.x for s6-overlay
---
 alpinelinux/root/etc/cont-init.d/01-adduser.sh         | 2 +-
 alpinelinux/root/etc/cont-init.d/10-create-dirs.sh     | 2 +-
 alpinelinux/root/etc/cont-init.d/20-set-logging.sh     | 2 +-
 alpinelinux/root/etc/cont-init.d/98-set-permissions.sh | 2 +-
 alpinelinux/root/etc/cont-init.d/99-set-services.sh    | 2 +-
 alpinelinux/root/etc/services.d/acmesh-renewal/log/run | 2 +-
 alpinelinux/root/etc/services.d/acmesh-renewal/run     | 2 +-
 alpinelinux/root/usr/local/bin/acmesh-renewal.sh       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/alpinelinux/root/etc/cont-init.d/01-adduser.sh b/alpinelinux/root/etc/cont-init.d/01-adduser.sh
index 2ad4c97..a135f5d 100755
--- a/alpinelinux/root/etc/cont-init.d/01-adduser.sh
+++ b/alpinelinux/root/etc/cont-init.d/01-adduser.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 set -eu
diff --git a/alpinelinux/root/etc/cont-init.d/10-create-dirs.sh b/alpinelinux/root/etc/cont-init.d/10-create-dirs.sh
index a1e20a1..c0d7c36 100755
--- a/alpinelinux/root/etc/cont-init.d/10-create-dirs.sh
+++ b/alpinelinux/root/etc/cont-init.d/10-create-dirs.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # This cont-init script is responsible for creating the directory structure required
diff --git a/alpinelinux/root/etc/cont-init.d/20-set-logging.sh b/alpinelinux/root/etc/cont-init.d/20-set-logging.sh
index 666c7e6..601bd0e 100755
--- a/alpinelinux/root/etc/cont-init.d/20-set-logging.sh
+++ b/alpinelinux/root/etc/cont-init.d/20-set-logging.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # This cont-init will only be applied if ACMESH_DAEMON is set to "1" which implies
diff --git a/alpinelinux/root/etc/cont-init.d/98-set-permissions.sh b/alpinelinux/root/etc/cont-init.d/98-set-permissions.sh
index 5cf82b6..9760bad 100755
--- a/alpinelinux/root/etc/cont-init.d/98-set-permissions.sh
+++ b/alpinelinux/root/etc/cont-init.d/98-set-permissions.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # This cont-init script is responsible for setting the correct permissions on files
diff --git a/alpinelinux/root/etc/cont-init.d/99-set-services.sh b/alpinelinux/root/etc/cont-init.d/99-set-services.sh
index d2eaef9..8ed3f41 100755
--- a/alpinelinux/root/etc/cont-init.d/99-set-services.sh
+++ b/alpinelinux/root/etc/cont-init.d/99-set-services.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # This cont-init script will remove the service directory if the daemon is not being
diff --git a/alpinelinux/root/etc/services.d/acmesh-renewal/log/run b/alpinelinux/root/etc/services.d/acmesh-renewal/log/run
index 1a39a19..c494cbb 100755
--- a/alpinelinux/root/etc/services.d/acmesh-renewal/log/run
+++ b/alpinelinux/root/etc/services.d/acmesh-renewal/log/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # This service script sets up logging service to capture stdin logs
diff --git a/alpinelinux/root/etc/services.d/acmesh-renewal/run b/alpinelinux/root/etc/services.d/acmesh-renewal/run
index 2ef10da..d239b5e 100755
--- a/alpinelinux/root/etc/services.d/acmesh-renewal/run
+++ b/alpinelinux/root/etc/services.d/acmesh-renewal/run
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 set -eu
diff --git a/alpinelinux/root/usr/local/bin/acmesh-renewal.sh b/alpinelinux/root/usr/local/bin/acmesh-renewal.sh
index 37a85fa..aeafe31 100755
--- a/alpinelinux/root/usr/local/bin/acmesh-renewal.sh
+++ b/alpinelinux/root/usr/local/bin/acmesh-renewal.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv bash
+#!/command/with-contenv bash
 # shellcheck shell=bash
 
 # This service script is the acme.sh renewal daemon that performs the renewal check