From c7680a4b80867c41ddee4b8cf4c5a3c7acc1f7e8 Mon Sep 17 00:00:00 2001 From: davidovski Date: Wed, 6 Oct 2021 20:09:17 +0100 Subject: Added syncing capabilities --- build-repo.sh | 151 +++++++++++++++++++++++++++++++++++----------------------- xibuild | 2 +- 2 files changed, 92 insertions(+), 61 deletions(-) diff --git a/build-repo.sh b/build-repo.sh index 038e4f6..d22fa1c 100755 --- a/build-repo.sh +++ b/build-repo.sh @@ -2,94 +2,125 @@ XIBUILD=./xibuild -fetch-pkg-builds () { +fetch () { git clone https://git.davidovski.xyz/xilinux/xipkgs mkdir dist +} +build () { for REPO in $(du -h xipkgs/repo/* | awk '{print $2}'); do REPO_NAME=$(echo $REPO | cut -d"/" -f2-) REPO_INDEX=dist/$REPO_NAME/index.html REPO_LIST=dist/$REPO_NAME/packages.txt - - echo " - - packages for $REPO_NAME - - - -

Packages in $REPO_NAME

- " > $REPO_INDEX + + start-index $REPO_NAME $REPO_INDEX printf "" > xibuild.report.log for BUILD_FILE in $REPO/*; do DEST=dist/$REPO_NAME $XIBUILD -o $DEST $BUILD_FILE - - PKG_NAME=$(basename $BUILD_FILE .xibuild) - DESC=$(grep $PKG_NAME xibuild.report.log | cut -d" " -f3-) - - COLOR="none" - if grep $PKG_NAME xibuild.report.log | grep -q new; then - COLOR="lime" - fi - if grep $PKG_NAME xibuild.report.log | grep -q fail; then - if [ ! -f $DEST ]; then - COLOR="orange" - else - COLOR="red" - fi - fi - echo " - - - - - - - - -" >> $REPO_INDEX + + extend-index $BUILD_FILE $REPO_INDEX done; rm xibuild.report.log + conclude-index $REPO_INDEX - echo "

$PKG_NAME

src

log

$DESC

$PKG_NAME.xipkg

.info

+ generate-package-list + add-additional + done; +} -

Latest builds: $(date)

+start-index () { + echo " + + packages for $1 + + + +

Packages in $1

+ " > $2 +} -

Legend:

build skipped; no updates
build failed; no previous version
build failed; previous version exists
build passed: new update

- - - " >> $REPO_INDEX +extend-index () { + PKG_NAME=$(basename $1 .xibuild) + DESC=$(grep $PKG_NAME xibuild.report.log | cut -d" " -f3-) + + COLOR="none" + if grep $PKG_NAME xibuild.report.log | grep -q new; then + COLOR="lime" + fi + if grep $PKG_NAME xibuild.report.log | grep -q fail; then + if [ ! -f $DEST ]; then + COLOR="orange" + else + COLOR="red" + fi + fi + echo " + + + + + + + + + " >> $2 +} - cd dist/$REPO_NAME - ls -1 *.xipkg.info > packages.txt - cd - +conclude-index () { + echo "

$PKG_NAME

$DESC

+ +

Latest builds: $(date)

+ +

Legend:

build skipped; no updates
build failed; no previous version
build failed; previous version exists
build passed: new update

+ + + " >> $1 +} - # move logs and sources - mv logs/* dist/$REPO_NAME/logs - - mkdir -p dist/$REPO_NAME/src - mv $REPO/* dist/$REPO_NAME/src/ - - # add key for whole repo - cp keychain/xi.pub dist/repo/ - done; +generate-package-list () { + cd dist/$REPO_NAME + ls -1 *.xipkg.info > packages.txt + cd - +} + +add-additional () { + # move logs and sources + mv logs/* dist/$REPO_NAME/logs + + mkdir -p dist/$REPO_NAME/src + mv $REPO/* dist/$REPO_NAME/src/ + # add key for whole repo + cp keychain/xi.pub dist/repo/ +} +clean () { rm -rf xipkgs rm -rf logs rm -rf tmp rm -rf xibuild.log } -fetch-pkg-builds +sync () { + [[ $# = 0 ]] || rsync -vLta --no-perms --no-owner --no-group --delete -z -e ssh ./dist/ $1 +} + + +# update the repository + +fetch +build +clean +sync $@ diff --git a/xibuild b/xibuild index 1ef7264..06fecb8 100755 --- a/xibuild +++ b/xibuild @@ -47,7 +47,7 @@ xibuild () { clean () { # clean up rm -rf $PKG_BUILD_DIR - rmdir $XI_ROOT/tmp > /dev/null 2>&1 + rmdir $XI_ROOT/tMp > /dev/null 2>&1 } build () { -- cgit v1.2.1