From 3c0a34f842a01f4bb30aa18c9a536860139607e3 Mon Sep 17 00:00:00 2001 From: Tobias Reisinger Date: Wed, 1 Jul 2020 23:39:09 +0200 Subject: [PATCH] fix: naming --- controller-testing/PKGBUILD | 6 +++--- controller/PKGBUILD | 14 +++++++------- ...-testing.service => emgauwa-controller.service} | 0 ...esting.sysusers => emgauwa-controller.sysusers} | 0 ...esting.tmpfiles => emgauwa-controller.tmpfiles} | 0 core-testing/PKGBUILD | 10 +++------- core/PKGBUILD | 6 +++--- ...a-core-testing.service => emgauwa-core.service} | 0 ...core-testing.sysusers => emgauwa-core.sysusers} | 0 ...core-testing.tmpfiles => emgauwa-core.tmpfiles} | 0 10 files changed, 16 insertions(+), 20 deletions(-) rename controller/{emgauwa-controller-testing.service => emgauwa-controller.service} (100%) rename controller/{emgauwa-controller-testing.sysusers => emgauwa-controller.sysusers} (100%) rename controller/{emgauwa-controller-testing.tmpfiles => emgauwa-controller.tmpfiles} (100%) rename core/{emgauwa-core-testing.service => emgauwa-core.service} (100%) rename core/{emgauwa-core-testing.sysusers => emgauwa-core.sysusers} (100%) rename core/{emgauwa-core-testing.tmpfiles => emgauwa-core.tmpfiles} (100%) diff --git a/controller-testing/PKGBUILD b/controller-testing/PKGBUILD index 48108e1..d8895d5 100644 --- a/controller-testing/PKGBUILD +++ b/controller-testing/PKGBUILD @@ -24,18 +24,18 @@ sha256sums=('8c1195f9d23edb195bf88363e066bf25dfa8b31c1f05f9be51e800ccf763ea4e' '5a4ce46c1302546509c0024d4614b5b0d47dde02467b7bf52b28ef6c4ead91e7') prepare() { - cd "$pkgname" + cd "controller" mkdir -p "build" } build() { - cd "$pkgname/build" || exit 1 + cd "controller/build" || exit 1 cmake -DWIRING_PI_DEBUG=ON .. make } package() { - install -Dm755 "${pkgname}/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" + install -Dm755 "controller/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/controller/PKGBUILD b/controller/PKGBUILD index 4303bae..cbc5f97 100644 --- a/controller/PKGBUILD +++ b/controller/PKGBUILD @@ -14,28 +14,28 @@ conflicts=('emgauwa-controller') backup=('etc/emgauwa/controller.ini') source=("https://git.serguzim.me/emgauwa/controller/archive/v$pkgver.tar.gz" "controller.ini" - "emgauwa-controller-testing.service" - "emgauwa-controller-testing.sysusers" - "emgauwa-controller-testing.tmpfiles") + "emgauwa-controller.service" + "emgauwa-controller.sysusers" + "emgauwa-controller.tmpfiles") sha256sums=('8a191242a329e0b559aac06584e8513254a065ae3780d59f62955bb52fec5d7c' - 'e467db2a2b382f34c125d01c735eb4ea83b971eb0928ac2863d19b7c151301c0' + '91d6bb80b7bfabbe3fc500c72ecc5173c70ef27483135a02739c74baa5720298' '8ece4b409d5550cdae23591217e440d8599ebf2175f2a91574c0b069314879a0' 'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798' '5a4ce46c1302546509c0024d4614b5b0d47dde02467b7bf52b28ef6c4ead91e7') prepare() { - cd "$pkgname" + cd "controller" mkdir -p "build" } build() { - cd "$pkgname/build" || exit 1 + cd "controller/build" || exit 1 cmake -DWIRING_PI_DEBUG=ON .. make } package() { - install -Dm755 "${pkgname}/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" + install -Dm755 "controller/build/controller" "${pkgdir}/usr/bin/emgauwa-controller" install -Dm660 "controller.ini" "${pkgdir}/etc/emgauwa/controller.ini" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/controller/emgauwa-controller-testing.service b/controller/emgauwa-controller.service similarity index 100% rename from controller/emgauwa-controller-testing.service rename to controller/emgauwa-controller.service diff --git a/controller/emgauwa-controller-testing.sysusers b/controller/emgauwa-controller.sysusers similarity index 100% rename from controller/emgauwa-controller-testing.sysusers rename to controller/emgauwa-controller.sysusers diff --git a/controller/emgauwa-controller-testing.tmpfiles b/controller/emgauwa-controller.tmpfiles similarity index 100% rename from controller/emgauwa-controller-testing.tmpfiles rename to controller/emgauwa-controller.tmpfiles diff --git a/core-testing/PKGBUILD b/core-testing/PKGBUILD index d1989db..18d6983 100644 --- a/core-testing/PKGBUILD +++ b/core-testing/PKGBUILD @@ -23,23 +23,19 @@ sha256sums=('f1869e952835308ca921b96c9d2160c74ed511fcd3da6c5bd47a4e87302da67a' 'b9cde58b9e9b0605ca4a1eddd78067c55aa3c8d40f80cde0a25c4da9f6f95798' '0531f10303410afd7e53099e66b124ef2fd14afec9d33c4a0146793375acb6c2') -pkgver() { - grep -Po "^ *VERSION \K[[:digit:]]+\.[[:digit:]]+\.[[:digit:]]+$" "${pkgname}/CMakeLists.txt" -} - prepare() { - cd "$pkgname" + cd "core" mkdir -p "build" } build() { - cd "$pkgname/build" || exit 1 + cd "core/build" || exit 1 cmake .. make } package() { - install -Dm755 "${pkgname}/build/core" "${pkgdir}/usr/bin/emgauwa-core" + install -Dm755 "core/build/core" "${pkgdir}/usr/bin/emgauwa-core" install -Dm600 "core.ini" "${pkgdir}/etc/emgauwa/core.ini" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/core/PKGBUILD b/core/PKGBUILD index 2ca3cef..da0d26a 100644 --- a/core/PKGBUILD +++ b/core/PKGBUILD @@ -24,18 +24,18 @@ sha256sums=('82984c9742a63f9e8a561229b00926a85ff27a283054aa92f8ec712d67f87222' '0531f10303410afd7e53099e66b124ef2fd14afec9d33c4a0146793375acb6c2') prepare() { - cd "$pkgname" + cd "core" mkdir -p "build" } build() { - cd "$pkgname/build" || exit 1 + cd "core/build" || exit 1 cmake .. make } package() { - install -Dm755 "${pkgname}/build/core" "${pkgdir}/usr/bin/emgauwa-core" + install -Dm755 "core/build/core" "${pkgdir}/usr/bin/emgauwa-core" install -Dm600 "core.ini" "${pkgdir}/etc/emgauwa/core.ini" install -Dm644 "${pkgname}.service" "${pkgdir}/usr/lib/systemd/system/${pkgname}.service" diff --git a/core/emgauwa-core-testing.service b/core/emgauwa-core.service similarity index 100% rename from core/emgauwa-core-testing.service rename to core/emgauwa-core.service diff --git a/core/emgauwa-core-testing.sysusers b/core/emgauwa-core.sysusers similarity index 100% rename from core/emgauwa-core-testing.sysusers rename to core/emgauwa-core.sysusers diff --git a/core/emgauwa-core-testing.tmpfiles b/core/emgauwa-core.tmpfiles similarity index 100% rename from core/emgauwa-core-testing.tmpfiles rename to core/emgauwa-core.tmpfiles