Skip to content

Commit 9eea1ec

Browse files
committed
export var
1 parent 5608352 commit 9eea1ec

File tree

3 files changed

+20
-16
lines changed

3 files changed

+20
-16
lines changed

.github/workflows/release.yml

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,24 @@ jobs:
8282
- name: Copy script
8383
run: |
8484
echo "#!/bin/bash
85-
sudonot() {
85+
sudo() {
8686
if command -v sudo >/dev/null; then
87-
sudo \${@:-:} || \${@:-:}
87+
command sudo -E \${@:-:} || \${@:-:}
8888
else
8989
\${@:-:}
9090
fi
9191
}
92-
sudonot apt-get update
93-
sudonot DEBIAN_FRONTEND=noninteractive apt-get -o APT::Get::AllowUnauthenticated=true install -qq gpg wget
94-
sudonot mkdir -m 0755 -p /etc/apt/keyrings/
95-
wget -qO- https://ipitio.github.io/closure/gpg.key | gpg --dearmor | sudonot tee /etc/apt/keyrings/closure.gpg > /dev/null
96-
echo \"deb [signed-by=/etc/apt/keyrings/closure.gpg] https://ipitio.github.io/closure master main\" | sudonot tee /etc/apt/sources.list.d/closure.list &>/dev/null
97-
sudonot chmod 644 /etc/apt/keyrings/closure.gpg
98-
sudonot chmod 644 /etc/apt/sources.list.d/closure.list
99-
sudonot apt-get update
100-
sudonot DEBIAN_FRONTEND=noninteractive apt-get -o APT::Get::AllowUnauthenticated=true install --no-install-recommends -qq closure
92+
export DEBIAN_FRONTEND=noninteractive
93+
sudo apt-get update
94+
sudo apt-get -o APT::Get::AllowUnauthenticated=true install -qq gpg wget
95+
sudo mkdir -m 0755 -p /etc/apt/keyrings/
96+
wget -qO- https://ipitio.github.io/closure/gpg.key | gpg --dearmor | sudo tee /etc/apt/keyrings/closure.gpg > /dev/null
97+
echo \"deb [signed-by=/etc/apt/keyrings/closure.gpg] https://ipitio.github.io/closure master main\" | sudo tee /etc/apt/sources.list.d/closure.list &>/dev/null
98+
sudo chmod 644 /etc/apt/keyrings/closure.gpg
99+
sudo chmod 644 /etc/apt/sources.list.d/closure.list
100+
sudo apt-get update
101+
sudo apt-get -o APT::Get::AllowUnauthenticated=true install --no-install-recommends -qq closure
102+
DEBIAN_FRONTEND=
101103
" | tee ${{ steps.create-apt-repo.outputs.dir }}/i
102104
103105
- name: Upload artifact

init.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,18 @@
44
sudonot() {
55
# shellcheck disable=SC2068
66
if command -v sudo >/dev/null; then
7-
sudo "${@:-:}" || "${@:-:}"
7+
sudo -E ${@:-:} || ${@:-:}
88
else
9-
"${@:-:}"
9+
${@:-:}
1010
fi
1111
}
1212

1313
apt_install() {
1414
if ! dpkg -l "$@" >/dev/null 2>&1; then
1515
sudonot apt-get update
16-
sudonot DEBIAN_FRONTEND=noninteractive apt-get install -yqq "$@"
16+
export DEBIAN_FRONTEND=noninteractive
17+
sudonot apt-get install -yqq "$@"
18+
DEBIAN_FRONTEND=
1719
fi
1820
}
1921

lib.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ user_exists() { id "$1" &>/dev/null; }
4040

4141
sudo() {
4242
if command -v sudo >/dev/null; then
43-
command sudo "${@:-:}" || "${@:-:}"
43+
command sudo -E ${@:-:} || ${@:-:}
4444
else
45-
"${@:-:}"
45+
${@:-:}
4646
fi
4747
}
4848

0 commit comments

Comments
 (0)