forked from synit/synit
Fix http_proxy in transmogrity; add mpg123
This commit is contained in:
parent
cf6d1ef5f9
commit
3c91e5d74b
|
@ -6,7 +6,16 @@ set -eu
|
||||||
|
|
||||||
SUDOPASS=${SUDOPASS:-user}
|
SUDOPASS=${SUDOPASS:-user}
|
||||||
REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY:-}
|
REBOOT_AFTER_TRANSMOGRIFY=${REBOOT_AFTER_TRANSMOGRIFY:-}
|
||||||
http_proxy=${http_proxy:-http://10.0.2.2:3128/}
|
|
||||||
|
if [ -z "${http_proxy:-}" ]
|
||||||
|
then
|
||||||
|
if ip a | grep -q -F 10.0.2
|
||||||
|
then
|
||||||
|
http_proxy=http://10.0.2.2:3128/
|
||||||
|
else
|
||||||
|
http_proxy=
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if [ $(id -u) -ne 0 ]
|
if [ $(id -u) -ne 0 ]
|
||||||
then
|
then
|
||||||
|
@ -23,6 +32,7 @@ cp synit-apk-key.pub /etc/apk/keys/.
|
||||||
. /etc/deviceinfo
|
. /etc/deviceinfo
|
||||||
ls packages/$deviceinfo_arch/
|
ls packages/$deviceinfo_arch/
|
||||||
|
|
||||||
|
echo "Will use http_proxy=${http_proxy}"
|
||||||
apk add -X `pwd`/packages \
|
apk add -X `pwd`/packages \
|
||||||
preserves-tools \
|
preserves-tools \
|
||||||
squeak-cog-vm \
|
squeak-cog-vm \
|
||||||
|
@ -31,6 +41,7 @@ apk add -X `pwd`/packages \
|
||||||
\
|
\
|
||||||
alsa-utils \
|
alsa-utils \
|
||||||
qmi-utils \
|
qmi-utils \
|
||||||
|
mpg123 \
|
||||||
\
|
\
|
||||||
docker
|
docker
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue