This commit is contained in:
Daniel Langbein 2021-05-13 15:14:49 +00:00
parent 0bc4bc911d
commit 58673a27ec
4 changed files with 35 additions and 11 deletions

View File

@ -12,11 +12,13 @@ function start-docker() {
case "${res}" in case "${res}" in
"ActiveState=active") "ActiveState=active")
# Docker service is active # Docker service is active
;; true
;;
"ActiveState=inactive") "ActiveState=inactive")
# Docker service is inactive -> Let's start it # Docker service is inactive -> Let's start it
echo "Starting docker service ..." echo "Starting docker service ..."
sudo systemctl start docker || return $? sudo systemctl start docker || return $?
sleep 5s
;; ;;
*) *)
echo "Unknown state or error!" echo "Unknown state or error!"
@ -28,14 +30,36 @@ function build-pkg() {
sudo docker-compose run makepkg "${1}" sudo docker-compose run makepkg "${1}"
} }
function push-pkg() {
arch-repo-push-new || return $? # Push remote repository
}
function build-and-push() {
for PKG in "$@"; do
build-pkg "${PKG}" || return $?
done
push-pkg || return $?
}
function main() { function main() {
start-docker || return $? start-docker || return $?
is-installed "docker-compose" || return $? is-installed "docker-compose" || return $?
PKGS=(xorg-meta de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo) # PKGS=(xorg-meta de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo)
for PKG in "${PKGS[@]}"; do # for PKG in "${PKGS[@]}"; do
build-pkg "${PKG}" || return $? # build-pkg "${PKG}" || return $?
done # done
# Stage1
build-and-push xorg-meta de-p1st-systemd de-p1st-sudo de-p1st-screen de-p1st-pacman de-p1st-pacman-mirrorlist de-p1st-networkmanager de-p1st-ucode-placeholder de-p1st-ucode-intel de-p1st-ucode-amd de-p1st-nano de-p1st-mkinitcpio de-p1st-makepkg de-p1st-grub de-p1st-font de-p1st-keyboard-de de-p1st-keyboard-x11-de de-p1st-gnupg de-p1st-redshift de-p1st-theme de-p1st-gpu-generic de-p1st-gpu-amdgpu de-p1st-installer de-p1st-repo || return $?
# Stage2
build-and-push de-p1st-smartcard de-p1st-kernel-default de-p1st-kernel-lts de-p1st-dns || return $?
# Stage3
build-and-push de-p1st-base || return $?
# Stage4
build-and-push de-p1st-xfce4 || return $?
# Stage5
build-and-push de-p1st-xfce4-hidpi || return $?
echo "Successfully built all packages!" echo "Successfully built all packages!"
} }

View File

@ -3,7 +3,7 @@ _pkgname=repo
_reponame=arch _reponame=arch
pkgname="de-p1st-$_pkgname" pkgname="de-p1st-$_pkgname"
pkgver=0.2.0 pkgver=0.2.0
pkgrel=1 pkgrel=2
pkgdesc="Bash script to manage remote Arch Linux repository" pkgdesc="Bash script to manage remote Arch Linux repository"
arch=('any') arch=('any')
url="https://codeberg.org/privacy1st/${_reponame}" url="https://codeberg.org/privacy1st/${_reponame}"

View File

@ -1,6 +1,6 @@
# host from ssh configuration which logs in # Host from ssh configuration which logs in
# as correct user to have write access to # as correct user to have write access to
# REMOTE_PKG_DIR # REMOTE_PKG_DIR.
REMOTE_SSH_HOST=rootnas REMOTE_SSH_HOST=rootnas
LOCAL_PKG_DIRS=('/home/custompkgs' '/home/yoda/Downloads/git/arch/out') LOCAL_PKG_DIRS=('/home/custompkgs' '/home/yoda/Downloads/git/arch/out')
@ -8,7 +8,7 @@ REMOTE_PKG_DIR=/mnt/data/live/arch-repo
REMOTE_DB_NAME=de-p1st REMOTE_DB_NAME=de-p1st
# #
# Some variables for index.html generation # Some variables for index.html generation.
# #
HTML_TITLE='privacy1st.de Arch Packages' HTML_TITLE='privacy1st.de Arch Packages'
HTML_HEADING='My personalized Arch Packages' HTML_HEADING='My personalized Arch Packages'

4
run.sh
View File

@ -41,8 +41,8 @@ function main(){
sudo chown "build:wheel" /out sudo chown "build:wheel" /out
# Refresh mirrors -> not required as makepkg does this on every run # Refresh mirrors
# sudo pacman -Sy sudo pacman -Sy
# If first argument is zero, use default directory # If first argument is zero, use default directory
if [ -z "${1}" ]; then if [ -z "${1}" ]; then