[mkinitcpio-paralogo]: re-work for parabola git server

16 files changed, 39 insertions, 238 deletions

diff --git a/pcr/mkinitcpio-paralogo/PKGBUILD b/pcr/mkinitcpio-paralogo/PKGBUILD
index ceac1c9d2..f3d03f719 100644
--- a/pcr/mkinitcpio-paralogo/PKGBUILD
+++ b/pcr/mkinitcpio-paralogo/PKGBUILD
@@ -1,48 +1,49 @@
 # Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>
 
 pkgname=mkinitcpio-paralogo
-pkgver=0.0.1
+pkgver=0.0.2
 pkgrel=1
 pkgdesc="Add colored Parabola Linux ASCII art logo to early boot process"
 arch=('any')
-url="https://github.com/XL04D/mkinitcpio-paralogo"
+url=https://git.parabola.nu/mkinitcpio-paralogo.git/
+license=('GPL')
+
 depends=('mkinitcpio')
 makedepends=('git')
-license=('GPL')
-install=mkinitcpio-paralogo.install
-source=('git://github.com/XL04D/mkinitcpio-paralogo.git')
 backup=('etc/paralogo.conf')
-    
-pkgver() {
-	cd mkinitcpio-paralogo/
-
-	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
-	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
-	fi
-}
+install=mkinitcpio-paralogo.install
+source=(git+https://git.parabola.nu/mkinitcpio-paralogo.git#tag=${pkgver})
 
-package() {
-	cd mkinitcpio-paralogo/
+sha256sums=('SKIP')
 
-	# install install script and unit file
-	install -D -m0644 install/paralogo ${pkgdir}/usr/lib/initcpio/install/paralogo
-	install -D -m0644 systemd/paralogo.service ${pkgdir}/usr/lib/systemd/system/paralogo.service
 
-	# install hook for plain old script based initramfs
-	install -D -m0755 hook/paralogo ${pkgdir}/usr/lib/initcpio/hooks/paralogo
+package()
+{
+  cd "${srcdir}"/mkinitcpio-paralogo/
 
-	# install config
-	install -D -m0644 etc/paralogo.conf ${pkgdir}/etc/paralogo.conf
+  # install install script and unit file
+  install -m0755 -d                       "${pkgdir}"/usr/lib/initcpio/install/
+  install -m0644 install/paralogo         "${pkgdir}"/usr/lib/initcpio/install/
+  install -m0755 -d                       "${pkgdir}"/usr/lib/systemd/system/
+  install -m0644 systemd/paralogo.service "${pkgdir}"/usr/lib/systemd/system/
 
-	# install logos
-	install -D -m0644 share/paralogo ${pkgdir}/usr/share/paralogo/paralogo
-	install -D -m0644 share/paralogo2 ${pkgdir}/usr/share/paralogo/paralogo2
-	install -D -m0644 share/paralogo3 ${pkgdir}/usr/share/paralogo/paralogo3
-	install -D -m0644 share/paralogo4 ${pkgdir}/usr/share/paralogo/paralogo4
-	install -D -m0644 share/paralogo5 ${pkgdir}/usr/share/paralogo/paralogo5
+  # install hook for plain old script based initramfs
+  install -m0755 -d                       "${pkgdir}"/usr/lib/initcpio/hooks/
+  install -m0755 hook/paralogo            "${pkgdir}"/usr/lib/initcpio/hooks/
 
-}
+  # install config
+  install -m0755 -d                       "${pkgdir}"/etc/
+  install -m0644 etc/paralogo.conf        "${pkgdir}"/etc/
 
-sha256sums=('SKIP')
+  # install logos
+  install -m0755 -d                       "${pkgdir}"/usr/share/paralogo/
+  install -m0644 share/paralogo           "${pkgdir}"/usr/share/paralogo/
+  install -m0644 share/paralogo2          "${pkgdir}"/usr/share/paralogo/
+  install -m0644 share/paralogo3          "${pkgdir}"/usr/share/paralogo/
+  install -m0644 share/paralogo4          "${pkgdir}"/usr/share/paralogo/
+  install -m0644 share/paralogo5          "${pkgdir}"/usr/share/paralogo/
+
+  # install README
+  install -m0755 -d                       "${pkgdir}"/usr/share/doc/paralogo/
+  install -m0644 README.md                "${pkgdir}"/usr/share/doc/paralogo/
+}
diff --git a/pcr/mkinitcpio-paralogo/PKGBUILD.save b/pcr/mkinitcpio-paralogo/PKGBUILD.save
deleted file mode 100644
index c2feb71c3..000000000
--- a/pcr/mkinitcpio-paralogo/PKGBUILD.save
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: Aurélien DESBRIÈRES <aurelien@hackers.camp>
-
-pkgname=mkinitcpio-paralogo
-pkgver=0.0.1
-pkgrel=1
-pkgdesc="Add colored Parabola Linux ASCII art logo to early boot process"
-arch=('any')
-url="https://github.com/XL04D/mkinitcpio-paralogo"
-depends=('mkinitcpio')
-makedepends=('git')
-license=('GPL')
-install=mkinitcpio-paralogo.install
-source=('git://github.com/XL04D/mkinitcpio-paralogo.git')
-backup=('etc/paralogo.conf')
-    
-pkgver() {
-	cd mkinitcpio-paralogo/
-
-	if GITTAG="$(git describe --abbrev=0 --tags 2>/dev/null)"; then
-		echo "$(sed -e "s/^${pkgname%%-git}//" -e 's/^[-_/a-zA-Z]\+//' -e 's/[-_+]/./g' <<< ${GITTAG}).r$(git rev-list --count ${GITTAG}..).g$(git log -1 --format="%h")"
-	else
-		echo "0.r$(git rev-list --count master).g$(git log -1 --format="%h")"
-	fi
-}
-
-package() {
-	cd mkinitcpio-paralogo/
-
-	# install install script and unit file
-	install -D -m0644 install/paralogo ${pkgdir}/usr/lib/initcpio/install/paralogo
-	install -D -m0644 systemd/paralogo.service ${pkgdir}/usr/lib/systemd/system/paralogo.service
-
-	# install hook for plain old script based initramfs
-	install -D -m0755 hook/paralogo ${pkgdir}/usr/lib/initcpio/hooks/paralogo
-
-	# install config
-	install -D -m0644 etc/paralogo.conf ${pkgdir}/etc/paralogo.conf
-
-	# install logos
-	install -D -m0644 share/paralogo ${pkgdir}/usr/share/paralogo/paralogo
-	install -D -m0644 share/paralogo2 ${pkgdir}/usr/share/paralogo/paralogo2
-	install -D -m0644 share/paralogo3 ${pkgdir}/usr/share/paralogo/paralogo3
-	install -D -m0644 share/paralogo4 ${pkgdir}/usr/share/paralogo/paralogo4
-	install -D -m0644 share/paralogo4 ${pkgdir}/usr/share/paralogo/paralogo5
-
-}
-
-sha256sums=('SKIP')
diff --git a/pcr/mkinitcpio-paralogo/README.md b/pcr/mkinitcpio-paralogo/README.md
deleted file mode 100644
index 6fb375dc1..000000000
--- a/pcr/mkinitcpio-paralogo/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-mkinitcpio-paralogo
-===================
-
-Had the Parabola logo to your system on start
diff --git a/pcr/mkinitcpio-paralogo/etc/paralogo.conf b/pcr/mkinitcpio-paralogo/etc/paralogo.conf
deleted file mode 100755
index ec8c09ae8..000000000
--- a/pcr/mkinitcpio-paralogo/etc/paralogo.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# ASCII Parabola Logo on bootup 
-
-PARALOGO="paralogo"
diff --git a/pcr/mkinitcpio-paralogo/hook/paralogo b/pcr/mkinitcpio-paralogo/hook/paralogo
deleted file mode 100755
index a56ab0a78..000000000
--- a/pcr/mkinitcpio-paralogo/hook/paralogo
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-run_earlyhook() {
-	source /etc/paralogo.conf
-	cd /usr/share/paralogo/
-	cat "${PARALOGO}"
-}
diff --git a/pcr/mkinitcpio-paralogo/install/paralogo b/pcr/mkinitcpio-paralogo/install/paralogo
deleted file mode 100755
index 9c28941d5..000000000
--- a/pcr/mkinitcpio-paralogo/install/paralogo
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-build() {
-	source /etc/paralogo.conf
-	add_file /etc/paralogo.conf
-	add_file "/usr/share/paralogo/${PARALOGO}"
-	if add_systemd_unit paralogo.service 2>/dev/null; then
-		add_symlink "/usr/lib/systemd/system/sysinit.target.wants/paralogo.service" "../paralogo.service"
-	fi
-		add_runscript
-	        systemctl enable paralogo.service
-	
-        fi
-}
-
-help() {
-	echo "This hook adds an Parabola Linux logo to the boot process."
-}
diff --git a/pcr/mkinitcpio-paralogo/install/paralogo~works b/pcr/mkinitcpio-paralogo/install/paralogo~works
deleted file mode 100644
index e927966aa..000000000
--- a/pcr/mkinitcpio-paralogo/install/paralogo~works
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-build() {
-	source /etc/paralogo.conf
-	add_file /etc/paralogo.conf
-	add_file "/usr/share/paralogo/${PARALOGO}"
-	if add_systemd_unit paralogo.service 2>/dev/null; then
-		add_symlink "/usr/lib/systemd/system/sysinit.target.wants/paralogo.service" "../paralogo.service"
-	else
-		add_runscript
-	        systemctl enable paralogo.service
-	fi
-}
-
-help() {
-	echo "This hook adds an Parabola Linux logo to the boot process."
-}
diff --git a/pcr/mkinitcpio-paralogo/license b/pcr/mkinitcpio-paralogo/license
deleted file mode 100644
index 03ef6c673..000000000
--- a/pcr/mkinitcpio-paralogo/license
+++ /dev/null
@@ -1,9 +0,0 @@
-    mkinitcpio-paralogo is to had Parabola GNU / Linux-libre logo on boot system.
-    Aurélien DESBRIÈRES aurelien(at)hackers(dot)camp
-
-    It is a fork (rewrited/rebranded for Parabola GNU / Linux-libre)
-    of https://aur.archlinux.org/packages/mkinitcpio-archlogo
-    which is GPL.
-
-    See https://www.gnu.org/licenses/gpl
-
diff --git a/pcr/mkinitcpio-paralogo/mkinitcpio-paralogo.install b/pcr/mkinitcpio-paralogo/mkinitcpio-paralogo.install
index 608a2ad24..12ce4e570 100644
--- a/pcr/mkinitcpio-paralogo/mkinitcpio-paralogo.install
+++ b/pcr/mkinitcpio-paralogo/mkinitcpio-paralogo.install
@@ -1,12 +1,13 @@
 #!/bin/sh
 
 post_install() {
-	echo " > Now add 'paralogo' to your HOOKS array in /etc/mkinitcpio.conf"
-	echo " > and rebuild initial ramdisk with # mkinitcpio -p linux-libre"
-	echo " > You can put your own artwork in /usr/share/paralogo/ and select"
-	echo " > a non-default one in /etc/paralogo.conf."
+  echo " > Now add 'paralogo' to your HOOKS array in /etc/mkinitcpio.conf"
+  echo " >   and rebuild initial ramdisk for your kernel(s)"
+  echo " >   e.g. # mkinitcpio -p linux-libre"
+  echo " > You can put your own artwork in /usr/share/paralogo/ and select"
+  echo " >   a non-default one in /etc/paralogo.conf."
 }
 
 post_remove() {
-	sed -i "/^HOOKS=/s/paralogo//" /etc/mkinitcpio.conf
+  sed -i "/^HOOKS=/s/paralogo//" /etc/mkinitcpio.conf
 }
diff --git a/pcr/mkinitcpio-paralogo/parablogo.service b/pcr/mkinitcpio-paralogo/parablogo.service
deleted file mode 100644
index e0c3e42d0..000000000
--- a/pcr/mkinitcpio-paralogo/parablogo.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Paralogo
-DefaultDependencies=no
-Before=sysinit.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-StandardOutput=tty
-EnvironmentFile=/etc/paralogo.conf
-WorkingDirectory=/usr/share/paralogo
-ExecStart=/usr/bin/cat "${PARALOGO}"
diff --git a/pcr/mkinitcpio-paralogo/share/paralogo b/pcr/mkinitcpio-paralogo/share/paralogo
deleted file mode 100755
index 1e55d1ebb..000000000
--- a/pcr/mkinitcpio-paralogo/share/paralogo
+++ /dev/null
@@ -1,11 +0,0 @@
-
-           #   ##      ____                  _           _
-        # #   ####    /  _ \ __ _ _ __ ___ _| |_    ___ | | __ _ 
-     # #     ######   | |_) / _` | '__/ _ ` | '_ \ / _ \| |/ _` |
-   ##         #####   |  __| (_| | | | (_|  | |_| | |_| | | (_| |
- #            #####   | |   \__,_|_|  \___,_|_,__/ \___/|_|\__,_|
-              ####    |_|
-              ###
-             ###
-             ##           Make it simple and flexible.
-            #
diff --git a/pcr/mkinitcpio-paralogo/share/paralogo2 b/pcr/mkinitcpio-paralogo/share/paralogo2
deleted file mode 100755
index 5ca90c20c..000000000
--- a/pcr/mkinitcpio-paralogo/share/paralogo2
+++ /dev/null
@@ -1,19 +0,0 @@
-
-                         ##     ###
-                    ##  ##     #####
-               ##  ##  ##     #######
-            # ##  ##  ##     ########
-         ### #              #########
-      ###                   #########   Parabola GNU / Linux-libre
-   ##                        ########   Make it Simple, Flexible!
-                             #######
-                             ######    
-                            ######
-                            #####
-                           #####
-                           ####
-                          ####
-                         ###
-                        ###
-                       ##
-                      #
diff --git a/pcr/mkinitcpio-paralogo/share/paralogo3 b/pcr/mkinitcpio-paralogo/share/paralogo3
deleted file mode 100644
index c1f256cd9..000000000
--- a/pcr/mkinitcpio-paralogo/share/paralogo3
+++ /dev/null
@@ -1,14 +0,0 @@
- 
-      ███
-   ██     ███                                   ██                ████
- ██  ███   ███                                ████                ███
-███  ███   ██   ██████   ██████    ██████   ███████    █████   ████     █████
-    ████  ██  ███   ██   ███  ██ ████  ██  ████  ██  ████  ██  ███    ███  ██ 
-   ████      ███   ███   ███     ███   ██   ███   ██ ███   ███ ███   ███   ██
-   ███       ███  ████  ████     ███  ███  ████  ██  ███  ███  ███   ███  ███
- ████        ████ ████ ███       ████ ███  █████     █████    █████  ████ ███
-
-
-
-Parabola equals software freedom plus all power to the users
- 
\ No newline at end of file
diff --git a/pcr/mkinitcpio-paralogo/share/paralogo4 b/pcr/mkinitcpio-paralogo/share/paralogo4
deleted file mode 100644
index c0479f177..000000000
--- a/pcr/mkinitcpio-paralogo/share/paralogo4
+++ /dev/null
@@ -1,14 +0,0 @@
- 
-  ████ 
- ██  ██                        ██              ██ 
- ██  ██                        ██              ██
- ██  ██    ████   ████    ████ █████     ███   ██    ████
- ██ ██  ███  ██ ██  ██ ███  ██ ██   ██ ██   ██ ██ ███  ██ 
- ██     ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
- ██     ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
- ██     ███  ██ ██     ███  ██ ██████    ███   ██ ████ ██
-
-
-
-Parabola equals software freedom plus all power to the users
- 
\ No newline at end of file
diff --git a/pcr/mkinitcpio-paralogo/share/paralogo5 b/pcr/mkinitcpio-paralogo/share/paralogo5
deleted file mode 100644
index 7216de2f2..000000000
--- a/pcr/mkinitcpio-paralogo/share/paralogo5
+++ /dev/null
@@ -1,13 +0,0 @@
- 
-  ████ 
- ██   ██                      ██              ██ 
- ██   ██                      ██              ██
- ██  ██   ████   ████    ████ █████     ███   ██    ████
- ██ ██  ██  ██ ██  ██  ██  ██ ██   ██ ██   ██ ██  ██  ██ 
- ██    ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ███  ██
- ██    ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
- ██     ██  ██ ██      ██  ██ ██████    ███   ██  ██  ██
-
-
- Parabola equals software freedom plus all power to the users
- 
\ No newline at end of file
diff --git a/pcr/mkinitcpio-paralogo/systemd/paralogo.service b/pcr/mkinitcpio-paralogo/systemd/paralogo.service
deleted file mode 100755
index e0c3e42d0..000000000
--- a/pcr/mkinitcpio-paralogo/systemd/paralogo.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Paralogo
-DefaultDependencies=no
-Before=sysinit.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-StandardOutput=tty
-EnvironmentFile=/etc/paralogo.conf
-WorkingDirectory=/usr/share/paralogo
-ExecStart=/usr/bin/cat "${PARALOGO}"