diff --git a/ubuntu-backports.sh b/ubuntu-backports.sh index 4dc4ab8..1dc2737 100644 --- a/ubuntu-backports.sh +++ b/ubuntu-backports.sh @@ -5,39 +5,40 @@ set -e chmod 755 ./ppp # output folders -mkdir -p ./output/output -cd ./output/output +mkdir -p ./output + +cd ./output # temp apt update apt upgrade -y # end of temp -apt install dpkg-sig wget rsync ssh reprepro -y +apt install dpkg-sig wget rsync ssh -y # Get ubuntu main pool echo "Getting ubuntu main pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu main pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu multiverse pool echo "Getting ubuntu multiverse pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu multiverse pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu restricted pool echo "Getting ubuntu restricted pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu restricted pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu universe pool echo "Getting ubuntu universe pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu universe pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-backports/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ cd ../ @@ -46,26 +47,11 @@ echo "Repos are synced" exit 0 fi -# Sign the packages -../ppp sign ./output/ +# send debs to server +rsync -azP ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ -# Pull down existing ppa repo db files etc -rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo +# add debs to repo +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-ubuntu /srv/www/incoming/' -# Check if the ubuntu component exists -if cat ./output/repo/conf/distributions | grep Components: | grep ubuntu -then - true -else - sed -i "s#Components:#Components: ubuntu#" ./output/repo/conf/distributions -fi - -apt remove reprepro -y -wget -nv https://launchpad.net/ubuntu/+archive/primary/+files/reprepro_5.3.0-1.4_amd64.deb -apt install -y ./reprepro_5.3.0-1.4_amd64.deb - -# Add the new packages to the repo -../ppp repoadd ./output/ "--keepunusednewfiles --keepunreferencedfiles -C ubuntu -V --ignore=missingfield --basedir ./output/repo/ includedeb lunar" - -# Push the updated ppa repo to the server -rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/ +# publish the repo +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' diff --git a/ubuntu-proposed.sh b/ubuntu-proposed.sh index e1497f4..6da785d 100644 --- a/ubuntu-proposed.sh +++ b/ubuntu-proposed.sh @@ -5,39 +5,40 @@ set -e chmod 755 ./ppp # output folders -mkdir -p ./output/output -cd ./output/output +mkdir -p ./output + +cd ./output # temp apt update apt upgrade -y # end of temp -apt install dpkg-sig wget rsync ssh reprepro -y +apt install dpkg-sig wget rsync ssh -y # Get ubuntu main pool echo "Getting ubuntu main pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu main pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu multiverse pool echo "Getting ubuntu multiverse pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu multiverse pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu restricted pool echo "Getting ubuntu restricted pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu restricted pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu universe pool echo "Getting ubuntu universe pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu universe pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-proposed/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ cd ../ @@ -46,26 +47,11 @@ echo "Repos are synced" exit 0 fi -# Sign the packages -../ppp sign ./output/ +# send debs to server +rsync -azP ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ -# Pull down existing ppa repo db files etc -rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo +# add debs to repo +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-ubuntu /srv/www/incoming/' -# Check if the ubuntu component exists -if cat ./output/repo/conf/distributions | grep Components: | grep ubuntu -then - true -else - sed -i "s#Components:#Components: ubuntu#" ./output/repo/conf/distributions -fi - -apt remove reprepro -y -wget -nv https://launchpad.net/ubuntu/+archive/primary/+files/reprepro_5.3.0-1.4_amd64.deb -apt install -y ./reprepro_5.3.0-1.4_amd64.deb - -# Add the new packages to the repo -../ppp repoadd ./output/ "--keepunusednewfiles --keepunreferencedfiles -C ubuntu -V --ignore=missingfield --basedir ./output/repo/ includedeb lunar" - -# Push the updated ppa repo to the server -rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/ +# publish the repo +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' \ No newline at end of file diff --git a/ubuntu-security.sh b/ubuntu-security.sh index 24e2c4e..82129a3 100644 --- a/ubuntu-security.sh +++ b/ubuntu-security.sh @@ -5,39 +5,40 @@ set -e chmod 755 ./ppp # output folders -mkdir -p ./output/output -cd ./output/output +mkdir -p ./output + +cd ./output # temp apt update apt upgrade -y # end of temp -apt install dpkg-sig wget rsync ssh reprepro -y +apt install dpkg-sig wget rsync ssh -y # Get ubuntu main pool echo "Getting ubuntu main pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu main pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu multiverse pool echo "Getting ubuntu multiverse pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu multiverse pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu restricted pool echo "Getting ubuntu restricted pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu restricted pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu universe pool echo "Getting ubuntu universe pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu universe pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-security/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ cd ../ @@ -46,26 +47,11 @@ echo "Repos are synced" exit 0 fi -# Sign the packages -../ppp sign ./output/ +# send debs to server +rsync -azP ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ -# Pull down existing ppa repo db files etc -rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo +# add debs to repo +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-ubuntu /srv/www/incoming/' -# Check if the ubuntu component exists -if cat ./output/repo/conf/distributions | grep Components: | grep ubuntu -then - true -else - sed -i "s#Components:#Components: ubuntu#" ./output/repo/conf/distributions -fi - -apt remove reprepro -y -wget -nv https://launchpad.net/ubuntu/+archive/primary/+files/reprepro_5.3.0-1.4_amd64.deb -apt install -y ./reprepro_5.3.0-1.4_amd64.deb - -# Add the new packages to the repo -../ppp repoadd ./output/ "--keepunusednewfiles --keepunreferencedfiles -C ubuntu -V --ignore=missingfield --basedir ./output/repo/ includedeb lunar" - -# Push the updated ppa repo to the server -rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/ +# publish the repo +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' \ No newline at end of file diff --git a/ubuntu-updates.sh b/ubuntu-updates.sh index 3c41216..fec7650 100644 --- a/ubuntu-updates.sh +++ b/ubuntu-updates.sh @@ -5,39 +5,40 @@ set -e chmod 755 ./ppp # output folders -mkdir -p ./output/output -cd ./output/output +mkdir -p ./output + +cd ./output # temp apt update apt upgrade -y # end of temp -apt install dpkg-sig wget rsync ssh reprepro -y +apt install dpkg-sig wget rsync ssh -y # Get ubuntu main pool echo "Getting ubuntu main pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/main/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu main pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu multiverse pool echo "Getting ubuntu multiverse pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu multiverse pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu restricted pool echo "Getting ubuntu restricted pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu restricted pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu universe pool echo "Getting ubuntu universe pool 32bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ echo "Getting ubuntu universe pool 64bit" -../../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar-updates/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ cd ../ @@ -46,26 +47,11 @@ echo "Repos are synced" exit 0 fi -# Sign the packages -../ppp sign ./output/ +# send debs to server +rsync -azP ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ -# Pull down existing ppa repo db files etc -rsync -azP --exclude '*.deb' ferreo@direct.pika-os.com:/srv/www/pikappa/ ./output/repo +# add debs to repo +ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-ubuntu /srv/www/incoming/' -# Check if the ubuntu component exists -if cat ./output/repo/conf/distributions | grep Components: | grep ubuntu -then - true -else - sed -i "s#Components:#Components: ubuntu#" ./output/repo/conf/distributions -fi - -apt remove reprepro -y -wget -nv https://launchpad.net/ubuntu/+archive/primary/+files/reprepro_5.3.0-1.4_amd64.deb -apt install -y ./reprepro_5.3.0-1.4_amd64.deb - -# Add the new packages to the repo -../ppp repoadd ./output/ "--keepunusednewfiles --keepunreferencedfiles -C ubuntu -V --ignore=missingfield --basedir ./output/repo/ includedeb lunar" - -# Push the updated ppa repo to the server -rsync -azP ./output/repo/ ferreo@direct.pika-os.com:/srv/www/pikappa/ +# publish the repo +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' \ No newline at end of file diff --git a/ubuntu.sh b/ubuntu.sh index 49dad36..e599045 100644 --- a/ubuntu.sh +++ b/ubuntu.sh @@ -23,22 +23,22 @@ echo "Getting ubuntu main pool 64bit" ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/main/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu multiverse pool -# echo "Getting ubuntu multiverse pool 32bit" -# ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ -# echo "Getting ubuntu multiverse pool 64bit" -# ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +echo "Getting ubuntu multiverse pool 32bit" +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +echo "Getting ubuntu multiverse pool 64bit" +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/multiverse/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu restricted pool -# echo "Getting ubuntu restricted pool 32bit" -# ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ -# echo "Getting ubuntu restricted pool 64bit" -# ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +echo "Getting ubuntu restricted pool 32bit" +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +echo "Getting ubuntu restricted pool 64bit" +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/restricted/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ # Get ubuntu universe pool -# echo "Getting ubuntu universe pool 32bit" -# ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ -# echo "Getting ubuntu universe pool 64bit" -# ../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +echo "Getting ubuntu universe pool 32bit" +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-i386/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-i386/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ +echo "Getting ubuntu universe pool 64bit" +../ppp https://ppa.pika-os.com/dists/lunar/ubuntu/binary-amd64/Packages.gz http://archive.ubuntu.com/ubuntu/dists/lunar/universe/binary-amd64/Packages.xz http://archive.ubuntu.com/ubuntu/ ./ cd ../ @@ -54,4 +54,4 @@ rsync -azP ./output/ ferreo@direct.pika-os.com:/srv/www/incoming/ ssh ferreo@direct.pika-os.com 'aptly repo add -force-replace -remove-files pika-ubuntu /srv/www/incoming/' # publish the repo -ssh ferreo@direct.pika-os.com 'aptly publish repo -batch -skip-contents -force-overwrite -component=,,,, pika-amdgpu pika-external pika-main pika-rocm pika-ubuntu filesystem:pikarepo:' +ssh ferreo@direct.pika-os.com 'aptly publish update -batch -skip-contents -force-overwrite lunar filesystem:pikarepo:' \ No newline at end of file