diff --git a/build.sh b/build.sh index 2c1c41a08..7302fef2a 100755 --- a/build.sh +++ b/build.sh @@ -47,12 +47,6 @@ build () { # Make sure conffile specified as arg has correct name cp -f "$BASE_DIR"/"$CONFIG_FILE" terraform.conf - # copy appcenter list & key - if [ "$INCLUDE_APPCENTER" = "yes" ]; then - cp "config/appcenter/appcenter.list.binary" "config/archives/appcenter.list.binary" - cp "config/appcenter/appcenter.key.binary" "config/archives/appcenter.key.binary" - fi - echo -e " #------------------# # LIVE-BUILD CLEAN # diff --git a/etc/config/appcenter/appcenter.key.binary b/etc/config/appcenter/appcenter.key.binary deleted file mode 100644 index ac1003b83..000000000 --- a/etc/config/appcenter/appcenter.key.binary +++ /dev/null @@ -1,31 +0,0 @@ ------BEGIN PGP PUBLIC KEY BLOCK----- -Version: GnuPG v1 - -mQENBFcRRNIBCADrEnIR91b2vX6BrAAYqDRTKZeFdMFG7StSqFo3lZH2KFd7KBeB -xYWnU3V/xJQ+1lFujo+na6z7L9qBrtikYdIn9Mc3eSyw/fli1FkMuoFmdMtj6k1F -z+NEM0dSrELavBMPzXb4kjF8ZGKneR35v4Y3RP+lvZDiumZpvFzTzU0ARURkxH3N -bYiX0mki75gy+EHwCReSPjBxK94+sQRoClJdrQbFaHtXDqfh2XVQMm2NnmJaf2Rb -MFo75zEoxHzYbnByWdR/Xh6uhlSyDaBY0O0f1c3ycGn7UT+7CAdGka6Gu2VZUXEH -GLZS4otVhtoyga+kGaiJ7SYRSQzd0S/xPPxtABEBAAG0KGVsZW1lbnRhcnkgYnVp -bGRzIDxidWlsZHNAZWxlbWVudGFyeS5pbz6JATcEEwEJACEFAlcRRNICGwMFCwkI -BwMFFQkKCAsFFgMCAQACHgECF4AACgkQp09z7/5wuRzfwQf/QeGtdlQiV3HJC/hF -yQ4CHOxZJFrpe/Ud/tazkUiplc2Y/mrretgdGhIoJ6NpQWpDTCLFmvD5CEq9lets -eRUNULw21utniuTrrDXZe1tom0FkFSdyCY8UpDDOc7LkzbQ8wKo1ASkyyEj8fVXL -EoOkbsjRQJUXS/6SdoRSeViutDewjTy0YvelUMVxcX5H5TjJfXmZMGUxtGUef3Ra -RDXR69kmFjf7Umv2AiiVsendqrfHRLnZQRsbblNAlNl5J+VTlKkvcwXivWewlVUa -OL8HPFo9d2kxIbexG2yLwnuwmfavSFJV4NYemSPSKl6lJVbI3P+zz+U87VOMr8Kf -uL0Do7kBDQRXEUTSAQgAvA3oZ7rN1iE8M3Q91HW37lBV+EtagirJUa6+m2ovPfa6 -TnOPsygSY8EiMPKB8rDxVRk32XnzwNl3MCmW0YjN1S2sdFv8YnPXLzXKJWYqTaCN -dgJPhFz+LdgPmuW2kHH3ENZ8kOBKeVJdQ+UCxZkEdJZVhnsIP60pHpS2l8oMGZYk -wtRpe6BDtJMlpgUVWK1jJrf/Uj/JA62+rpvAl27TxdZgpsmYNaOpg9gumV8aGtUk -4l6X0NjSkKaka7m2BULAHotYOAK18D0z7wsslGbSfCYKNKsXKoUbX9fpxjxPUprM -HQJ7NAefDgfieDImFmBpcSXEbznUzt5vgSKyHGNsuwARAQABiQEfBBgBCQAJBQJX -EUTSAhsMAAoJEKdPc+/+cLkceJAH/0XPU2fz+aiph4ltt9nvdkY/iqFJ4/ng2pYj -z9K9e8JWu65EBBkUn3J80cVwMTcCvZduDyMHizobPilHUyWAdwXtLXgLTY5TRfkd -HQTKVhFqq/LrprUBRoAJQfTbL6XdCX8Dy7q899yaiHsBJd1IzEBiKpfTOc1RmVt/ -tvaG0+WhBRe/aHu5wnKkfExLdsW8mDrNUnDykTj50Cki1kfFvLWlSLz6wlXyqG1U -1aB+nEM7d1/r/joFsoYft2TTscNi0HvxY8U1mNSD5H7IXK1ecGT53fSclPPkrVd5 -+F4YBpd9FIy7LBnLhfK0F4aBe7iTLPiYJ7TUpIez3k7ubRGGBZg= -=ICrR ------END PGP PUBLIC KEY BLOCK----- - diff --git a/etc/config/appcenter/appcenter.list.binary b/etc/config/appcenter/appcenter.list.binary deleted file mode 100644 index ae715ef89..000000000 --- a/etc/config/appcenter/appcenter.list.binary +++ /dev/null @@ -1,2 +0,0 @@ -deb http://packages.elementary.io/appcenter @BASECODENAME main - diff --git a/etc/terraform-amd64.conf b/etc/terraform-amd64.conf index aefae250b..7d046b1e8 100644 --- a/etc/terraform-amd64.conf +++ b/etc/terraform-amd64.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://archive.ubuntu.com/ubuntu/" HWE_KERNEL="yes" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX="" diff --git a/etc/terraform-arm64.conf b/etc/terraform-arm64.conf index 205bdb56d..13540da16 100644 --- a/etc/terraform-arm64.conf +++ b/etc/terraform-arm64.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://ports.ubuntu.com/ubuntu-ports/" HWE_KERNEL="yes" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX="" diff --git a/etc/terraform-daily-7.1-azure.conf b/etc/terraform-daily-7.1-azure.conf index a2a89429a..2afdb4a8b 100644 --- a/etc/terraform-daily-7.1-azure.conf +++ b/etc/terraform-daily-7.1-azure.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://azure.archive.ubuntu.com/ubuntu/" HWE_KERNEL="no" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX="" diff --git a/etc/terraform-daily-8.1-azure-amd64.conf b/etc/terraform-daily-8.1-azure-amd64.conf index 09c91b5b4..7a2d3be29 100644 --- a/etc/terraform-daily-8.1-azure-amd64.conf +++ b/etc/terraform-daily-8.1-azure-amd64.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://azure.archive.ubuntu.com/ubuntu/" HWE_KERNEL="yes" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX="" diff --git a/etc/terraform-daily-8.1-azure-arm64.conf b/etc/terraform-daily-8.1-azure-arm64.conf index 6db27d9cd..a33d7926b 100644 --- a/etc/terraform-daily-8.1-azure-arm64.conf +++ b/etc/terraform-daily-8.1-azure-arm64.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://azure.ports.ubuntu.com/ubuntu-ports/" HWE_KERNEL="yes" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX="" diff --git a/etc/terraform-stable-8.1-azure-amd64.conf b/etc/terraform-stable-8.1-azure-amd64.conf index a1875c386..2f331d868 100644 --- a/etc/terraform-stable-8.1-azure-amd64.conf +++ b/etc/terraform-stable-8.1-azure-amd64.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://azure.archive.ubuntu.com/ubuntu/" HWE_KERNEL="yes" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX="" diff --git a/etc/terraform-stable-8.1-azure-arm64.conf b/etc/terraform-stable-8.1-azure-arm64.conf index d4b510b29..59f9438a6 100644 --- a/etc/terraform-stable-8.1-azure-arm64.conf +++ b/etc/terraform-stable-8.1-azure-arm64.conf @@ -26,8 +26,5 @@ MIRROR_URL="http://azure.ports.ubuntu.com/ubuntu-ports/" HWE_KERNEL="yes" HWE_X11="no" -# use appcenter ppa -INCLUDE_APPCENTER="" - # suffix for generated .iso files OUTPUT_SUFFIX=""