moved main files from /etc/ into /usr/share/

3 files changed, 31 insertions, 29 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5263e07704f1..c5778f6e62ab 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
 pkgbase = icons-in-terminal
 	pkgdesc = Icon fonts in terminal without a need for replacing or patching existing
 	pkgver = r93.b12286d
-	pkgrel = 2
+	pkgrel = 3
 	url = https://github.com/sebastiencs/icons-in-terminal
 	arch = any
 	license = custom:MIT
 	makedepends = git
-	depends = fontconfig
+	depends = bash
 	provides = icons-in-terminal
 	conflicts = icons-in-terminal
 	source = git://github.com/sebastiencs/icons-in-terminal.git
-	sha512sums = SKIP
+	sha1sums = SKIP
 
 pkgname = icons-in-terminal
 	install = icons-in-terminal.install
diff --git a/PKGBUILD b/PKGBUILD
index 8fb36f7d18a2..ee50d7ffc308 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,17 +2,17 @@
 
 pkgname=icons-in-terminal
 pkgver=r93.b12286d
-pkgrel=2
+pkgrel=3
 pkgdesc="Icon fonts in terminal without a need for replacing or patching existing"
 url="https://github.com/sebastiencs/icons-in-terminal"
 arch=('any')
 license=('custom:MIT')
 provides=('icons-in-terminal')
 conflicts=('icons-in-terminal')
-depends=('fontconfig')
+depends=('bash')
 makedepends=('git')
-source=('git://github.com/sebastiencs/icons-in-terminal.git')
-sha512sums=('SKIP')
+source=("git://github.com/sebastiencs/$pkgname.git")
+sha1sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/$pkgname"
@@ -22,31 +22,33 @@ pkgver() {
 prepare() {
     cd "$srcdir/$pkgname"
 
-    sed -i 's filename="./build/mapping.txt" filename="/etc/icons-in-terminal/mapping.txt" ' print_icons.sh
-    ./scripts/generate_fontconfig.sh > 30-"$pkgname".conf
+    sed -i 's filename="./build/mapping.txt" filename="/usr/share/icons-in-terminal/mapping.txt" ' print_icons.sh
+    ./scripts/generate_fontconfig.sh > "30-$pkgname.conf"
 }
 
 package() {
+    cd "$srcdir/$pkgname"
 
-    install -dm755 "${pkgdir}"/etc/icons-in-terminal
-    install -dm755 "${pkgdir}"/etc/fonts/conf.avail
-    install -dm755 "${pkgdir}"/etc/fonts/conf.d
-    install -dm755 "${pkgdir}"/usr/share/fonts/TTF
-    install -dm755 "${pkgdir}"/usr/bin
+    install -dm755 "$pkgdir/usr/share/$pkgname"
 
-    cd "$srcdir/$pkgname"
+    if [ -d "/etc/$pkgname" ]; then
+        echo "  Backing up old config folder to location: /usr/share/$pkgname/backup"
+        echo "  If you haven't made any changes in the old folder you can safely remove this."
+        cp -RT "/etc/$pkgname" "$pkgdir/usr/share/$pkgname/backup"
+    fi
+
+    if [ ! -f "/etc/fonts/conf.avail/30-$pkgname.conf" ]; then
+        install -dm755 "$pkgdir/etc/fonts/conf.d"
+        install -Dm644 "30-$pkgname.conf"       "$pkgdir/etc/fonts/conf.avail/30-$pkgname.conf"
+        ln -rs "$pkgdir"/etc/fonts/conf.avail/* "$pkgdir/etc/fonts/conf.d/"
+    fi
 
-    install -m644 30-"$pkgname".conf    "${pkgdir}"/etc/fonts/conf.avail/
-    install -m644 build/*.ttf           "${pkgdir}"/usr/share/fonts/TTF/
-    install -m644 build/*               "${pkgdir}"/etc/icons-in-terminal/
-    install -m755 print_icons.sh        "${pkgdir}"/usr/bin/icons-in-terminal
+    install -Dm755 "print_icons.sh"         "$pkgdir/usr/bin/$pkgname"
+    install -Dm644 "README.md"              "$pkgdir/usr/share/$pkgname/README.md"
+    install -Dm644 "LICENSE"                "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    install -Dm644 "build/$pkgname.ttf"     "$pkgdir/usr/share/fonts/TTF/$pkgname.ttf"
 
-    pushd "${pkgdir}"/etc/fonts/conf.avail
-    for config in *; do
-        ln -sf ../conf.avail/${config} ../conf.d/${config}
-    done
-    popd
+    find build/ -type f ! -name "*.ttf" -exec install -m644 {} "$pkgdir/usr/share/$pkgname/" \;
 
-    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
     install='icons-in-terminal.install'
 }
diff --git a/icons-in-terminal.install b/icons-in-terminal.install
index 7c76b48299a1..a3c1290c3298 100644
--- a/icons-in-terminal.install
+++ b/icons-in-terminal.install
@@ -1,6 +1,6 @@
 post_install() {
-	echo -e "\n	Remember to check the file /etc/fonts/conf.avail/30-icons-in-terminal.conf"
-	echo -e "	to add or remove font(s) that should be used.\n"
-	echo -e "	To view available icons use command 'icons-in-terminal'."
-	echo -e "	Additional files are located in /etc/icons-in-terminal.\n"
+cat << 'EOM'
+	Font(s) that should use icons are added to file /etc/fonts/conf.avail/30-icons-in-terminal.conf
+	Use command 'icons-in-terminal' to view a list of available icons.
+EOM
 }