decentral1se/pandora
1
0
Fork 0
forked from 0x2620/pandora
Code Issues Pull requests Projects Releases Wiki Activity

always intsall gpg key from script

Browse source
This commit is contained in:
j 2014-11-20 17:06:00 +00:00
parent 083a74615b
commit 56ce668c84
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
vm/firstboot.sh
View file

@ -7,10 +7,8 @@ else
fi fi
UBUNTU_VERSION="$VERSION_ID" UBUNTU_VERSION="$VERSION_ID"
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
if [ "$ID" == "debian" ]; then echo "deb http://ppa.launchpad.net/j/pandora/ubuntu trusty main" > /etc/apt/sources.list.d/j-pandora.list
SYSTEMD="yes" apt-key add - << EOF
echo "deb http://ppa.launchpad.net/j/pandora/ubuntu trusty main" > /etc/apt/sources.list.d/j-pandora.list
apt-key add - << EOF
-----BEGIN PGP PUBLIC KEY BLOCK----- -----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1 Version: GnuPG v1
@ -26,6 +24,8 @@ pAAGSEQ4uz6bYSeM4Q==
-----END PGP PUBLIC KEY BLOCK----- -----END PGP PUBLIC KEY BLOCK-----
EOF EOF
if [ "$ID" == "debian" ]; then
SYSTEMD="yes"
else else
SYSTEMD="no" SYSTEMD="no"
if [ "$UBUNTU_VERSION" == "12.04" ]; then if [ "$UBUNTU_VERSION" == "12.04" ]; then
@ -37,8 +37,6 @@ else
update-manager-core \ update-manager-core \
software-properties-common \ software-properties-common \
$EXTRA $EXTRA
add-apt-repository -y ppa:j/pandora
fi fi
apt-get update apt-get update