diff --git a/.drone.yml b/.drone.yml index 355033e..cddb950 100644 --- a/.drone.yml +++ b/.drone.yml @@ -3,7 +3,7 @@ type: docker name: default steps: -- name: Update repo +- name: Build iso image: archlinux privileged: true commands: diff --git a/build.sh b/build.sh index b679cc7..29906db 100755 --- a/build.sh +++ b/build.sh @@ -1,16 +1,11 @@ #!/usr/bin/env bash - -#echo ' -#[askiiart] -#SigLevel = Optional -#Server = https://askiiart.net/repos/archlinux/$arch' >> /etc/pacman.conf +set -euxo pipefail pacman -Sy archiso git grub --noconfirm git clone https://git.blendos.co/blendOS/image-builder.git cd ./image-builder/ -sed -i 's/https:\/\/pkg-repo\.blendos\.co/https:\/\/askiiart.net\/repos\/archlinux\/$arch\nSigLevel = Optional/g' ./pacman.conf -sed -i 's/https:\/\/pkg-repo\.blendos\.co/https:\/\/askiiart.net\/repos\/archlinux\/$arch\nSigLevel = Optional/g' ./airootfs/etc/pacman.conf -sed -i 's/e2fsprogs/e2fsprogs\nefibootmgr/g' ./packages.x86_64 +sed -i 's/https:\/\/pkg-repo\.blendos\.co/https:\/\/askiiart.net\/repos\/blendos\/$arch\nSigLevel = Optional/g' ./pacman.conf +sed -i 's/https:\/\/pkg-repo\.blendos\.co/https:\/\/askiiart.net\/repos\/blendos\/$arch\nSigLevel = Optional/g' ./airootfs/etc/pacman.conf mkarchiso -v -w workdir/ -o out/ . @@ -23,7 +18,6 @@ cp -r $filename /iso/$date/ cd /iso/ num=$(find . -mindepth 1 -maxdepth 1 -name 'blendOS-*' -type d | wc -l) -echo $num if [ $(($num - 3)) -ge 1 ]; then rm -rf $(find . -mindepth 1 -maxdepth 1 -type d | sort | tail -n $(($num - 3))) fi