diff --git a/Makefile b/Makefile index 3aa0f75..6078bdc 100644 --- a/Makefile +++ b/Makefile @@ -1,40 +1,39 @@ -INSTALLDIR = ${pkgdir}/usr/local/bin -INSTALLLIST = ./maat-builder -OWNER=root -PERMS=0755 - +installDir = ${pkgdir}/usr/local/bin +list = ./maat-builder +systemdList = ./maat-builder.timer ./maat-builder.service +serverRoot = /srv/maat/ +owner=root +perms=0755 compile: /bin/bash @echo Nothing to compile. -install: ${INSTALLLIST} - mkdir -p ${INSTALLDIR} - mkdir -p /srv/maat/src - mkdir -p /srv/maat/pkg - mkdir -p /srv/maat/web - for i in ${INSTALLLIST}; do install -m ${PERMS} -o ${OWNER} $$i ${INSTALLDIR}; done +install: ${list} + mkdir -p ${installDir} + mkdir -p ${pkgdir}${serverRoot}/src + mkdir -p ${pkgdir}${serverRoot}/pkg + for i in ${list}; do install -m ${perms} -o ${owner} $$i ${installDir}; done + for i in ${systemdList}; do install -m 0644 -o root $$i ${pkgdir}/usr/lib/systemd/system; done clean: cat .gitignore | xargs rm -Rf uninstall: - for i in ${INSTALLLIST}; do rm -Rf ${INSTALLDIR}/$$i; done + for i in ${list}; do rm -Rf ${installDir}/$$i; done + for i in ${systemdList}; do rm /usr/lib/systemd/system/$$i; done + rmdir -p ${pkgdir}${serverRoot}/src + rmdir -p ${pkgdir}${serverRoot}/pkg test: - ./maat-builder -T - -test-run: - bash ./maat -v -d ./repo -b ./build -w ./web -c /dev/null + ./maat-builder -T -U $$USER diff: - for i in ${list}; do if [ -f ${INSTALLDIR}/$$i ]; then diff "$$i" "${INSTALLDIR}/$$i"; fi done + for i in ${list}; do if [ -f ${installDir}/$$i ]; then diff "$$i" "${installDir}/$$i"; fi done reverse: - for i in ${list}; do if [ -f ${INSTALLDIR}/$$i ]; then cp "${INSTALLDIR}/$$i" "$$i"; fi done + for i in ${list}; do if [ -f ${installDir}/$$i ]; then cp "${installDir}/$$i" "$$i"; fi done checkperm: - for i in ${list}; do chown ${OWNER}: "${INSTALLDIR}/$$i"; chmod ${PERMS} "${INSTALLDIR}/$$i"; done - chmod 0644 ${SUPPORTDIR}/maat.html - chown ${OWNER}: ${SUPPORTDIR}/maat.html - chmod 0644 ${pkgdir}/etc/lighttpd/conf.d/maat.conf - chown http: ${pkgdir}/etc/lighttpd/conf.d/maat.conf + chown -R ${owner}: ${pkgdir}${serverRoot}/src + chown -R ${owner}: ${pkgdir}${serverRoot}/pkg + for i in ${list}; do chown -R ${owner}: "${installDir}/$$i"; chmod ${perms} "${installDir}/$$i"; done diff --git a/maat-builder b/maat-builder index ccc8895..f493b6b 100755 --- a/maat-builder +++ b/maat-builder @@ -12,17 +12,19 @@ # ### Printing defaults -passCell="
These are the AniNIX testing results. We found $passcount passing and $failcount failing packages, with $warncount warnings. It took $runtime seconds to finish.
Package | Testing Status | Build Status | Latest Build | Time of Run |
---|
Package | Testing Status | Build Status | Latest Build | Time of Run |
---|