re-work for parabola git serverHEAD0.0.2master

10 files changed, 40 insertions, 107 deletions

diff --git a/license b/LICENSE
index 03ef6c6..c2ae0c0 100644
--- a/license
+++ b/LICENSE
@@ -1,4 +1,4 @@
-    mkinitcpio-paralogo is to had Parabola GNU / Linux-libre logo on boot system.
+    mkinitcpio-paralogo is to add 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)
@@ -6,4 +6,3 @@
     which is GPL.
 
     See https://www.gnu.org/licenses/gpl
-
diff --git a/PKGBUILD b/PKGBUILD
deleted file mode 100644
index c2feb71..0000000
--- a/PKGBUILD
+++ /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/README.md b/README.md
index 6fb375d..833ee6a 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
 mkinitcpio-paralogo
 ===================
 
-Had the Parabola logo to your system on start
+Add the Parabola logo to your system on start-up
diff --git a/install/paralogo b/install/paralogo
index e927966..aaa1f8b 100755
--- a/install/paralogo
+++ b/install/paralogo
@@ -1,17 +1,17 @@
 #!/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
+  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
+    which systemctl && systemctl enable paralogo.service
+  fi
 }
 
 help() {
-	echo "This hook adds an Parabola Linux logo to the boot process."
+  echo "This hook adds an Parabola Linux logo to the boot process."
 }
diff --git a/mkinitcpio-paralogo.install b/mkinitcpio-paralogo.install
deleted file mode 100644
index 608a2ad..0000000
--- a/mkinitcpio-paralogo.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/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."
-}
-
-post_remove() {
-	sed -i "/^HOOKS=/s/paralogo//" /etc/mkinitcpio.conf
-}
diff --git a/share/paralogo b/share/paralogo
index 1e55d1e..ddd04a9 100755
--- a/share/paralogo
+++ b/share/paralogo
@@ -1,11 +1,11 @@
 
-           #   ##      ____                  _           _
-        # #   ####    /  _ \ __ _ _ __ ___ _| |_    ___ | | __ _ 
-     # #     ######   | |_) / _` | '__/ _ ` | '_ \ / _ \| |/ _` |
-   ##         #####   |  __| (_| | | | (_|  | |_| | |_| | | (_| |
- #            #####   | |   \__,_|_|  \___,_|_,__/ \___/|_|\__,_|
-              ####    |_|
+           #   ##     ____
+        # #   ####   /  _ \                 _           _
+     # #     ######  | |_) | __ _ _ __ ___ _| |_    ___ | | __ _
+   ##         #####  |  __/ / _` | '__/ _ ` | '_ \ / _ \| |/ _` |
+ #            #####  | |   | (_| | | | (_|  | |_| | |_| | | (_| |
+              ####   |_|    \__,_|_|  \___,_|_,__/ \___/|_|\__,_|
               ###
-             ###
-             ##           Make it simple and flexible.
+             ###                  Free as in freedom
+             ##
             #
diff --git a/share/paralogo2 b/share/paralogo2
index 5ca90c2..2c7e92e 100755
--- a/share/paralogo2
+++ b/share/paralogo2
@@ -4,10 +4,10 @@
                ##  ##  ##     #######
             # ##  ##  ##     ########
          ### #              #########
-      ###                   #########   Parabola GNU / Linux-libre
-   ##                        ########   Make it Simple, Flexible!
+      ###                   #########   Parabola GNU / Linux-libre
+   ##                        ########       Free as in freedom
                              #######
-                             ######    
+                             ######
                             ######
                             #####
                            #####
diff --git a/share/paralogo3 b/share/paralogo3
index bda356c..3618606 100755
--- a/share/paralogo3
+++ b/share/paralogo3
@@ -2,14 +2,11 @@
       ███
    ██     ███                                   ██                ████
  ██  ███   ███                                ████                ███
-███  ███   ██   ███████   ███ ███   ███████   ███████    █████   ████    ███████
-    ████  ██  ███   ███   ███  ██ ████  ███  ████  ██  ████  ██  ███   ███   ███
-    █████    ████  ████  ███     ███   ████  ███   ███████   ██ ████  ███   ████
-   ████      ███   ███   ███     ███   ███   ███   ██ ███   ███ ███   ███   ███
-   ███       ███  ████  ████     ███  ████  ████  ██  ███  ███  ███  ████  ████
- ████        ████ ████ ███       ████ ████  █████     █████    █████  ████ ████
+███  ███   ██   ██████   ██████    ██████   ███████    █████   ████     █████
+    ████  ██  ███   ██   ███  ██ ████  ██  ████  ██  ████  ██  ███    ███  ██
+   ████      ███   ███   ███     ███   ██   ███   ██ ███   ███ ███   ███   ██
+   ███       ███  ████  ████     ███  ███  ████  ██  ███  ███  ███   ███  ███
+ ████        ████ ████ ███       ████ ███  █████     █████    █████  ████ ███
 
-
-
-Parabola equals software freedom plus all power to the users
- 
\ No newline at end of file
+                              Free as in freedom
+ 
diff --git a/share/paralogo4 b/share/paralogo4
index c0479f1..fcfe8a1 100644
--- a/share/paralogo4
+++ b/share/paralogo4
@@ -1,14 +1,12 @@
  
-  ████ 
- ██  ██                        ██              ██ 
+  ████
+ ██  ██                        ██              ██
  ██  ██                        ██              ██
  ██  ██    ████   ████    ████ █████     ███   ██    ████
- ██ ██  ███  ██ ██  ██ ███  ██ ██   ██ ██   ██ ██ ███  ██ 
+ ██ ██  ███  ██ ██  ██ ███  ██ ██   ██ ██   ██ ██ ███  ██
  ██     ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
  ██     ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
  ██     ███  ██ ██     ███  ██ ██████    ███   ██ ████ ██
 
-
-
-Parabola equals software freedom plus all power to the users
- 
\ No newline at end of file
+                    Free as in freedom
+ 
diff --git a/share/paralogo5 b/share/paralogo5
index 2605a85..bc6ca90 100644
--- a/share/paralogo5
+++ b/share/paralogo5
@@ -1,13 +1,12 @@
  
-  ████                                        ██  
- ██   ██                      ██              ██ 
+  ████
  ██   ██                      ██              ██
- ██  ██   ███   ████     ███  █████     ███   ██    ███ 
- ██ ██  ██  ██ ██  ██  ██  ██ ██   ██ ██   ██ ██  ██  ██ 
+ ██   ██                      ██              ██
+ ██  ██   ████   ████    ████ █████     ███   ██    ████
+ ██ ██  ██  ██ ██  ██  ██  ██ ██   ██ ██   ██ ██  ██  ██
  ██    ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
  ██    ██   ██ ██     ██   ██ ██   ██ ██   ██ ██ ██   ██
  ██     ██  ██ ██      ██  ██ ██████    ███   ██  ██  ██
 
-
- Parabola equals software freedom plus all power to the users
+                   Free as in freedom