From 1f9ffed8f43a07f33305cde4c477425251e296fe Mon Sep 17 00:00:00 2001
From: Sergei Eremenko <finalitik@gmail.com>
Date: Sat, 26 Nov 2016 01:38:40 +0200
Subject: [PATCH] New installer

---
 install-papirus-home.sh | 53 +++++++++++++++++++++++++++++-----------
 install-papirus-root.sh | 54 +++++++++++++++++++++++++++++------------
 remove-papirus.sh       | 32 ++++++++++++++++++++----
 3 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/install-papirus-home.sh b/install-papirus-home.sh
index c3ab60af6c..15e4611914 100755
--- a/install-papirus-home.sh
+++ b/install-papirus-home.sh
@@ -1,15 +1,40 @@
-#!/usr/bin/env bash
-echo "Papirus icon theme for GTK"
-! which 7za > /dev/null 2>&1 && { echo "Please install p7zip-full"; exit 1; }
-echo "Download new version from GitHub ..."
-wget -c https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk/archive/master.zip -O /tmp/papirus-icon-theme-gtk.zip
-echo "Unpack archive ..."
-7za x /tmp/papirus-icon-theme-gtk.zip -o/tmp/ > /dev/null
-echo "Delete old Papirus icon theme ..."
-rm -rf ~/.icons/{Papirus-GTK,Papirus-Dark-GTK}
-echo "Installing ..."
+#!/bin/sh
+
+set -e
+
+cat <<- 'EOF'
+
+
+
+      ppppp                         ii
+      pp   pp     aaaaa   ppppp          rr  rrr   uu   uu     sssss
+      ppppp     aa   aa   pp   pp   ii   rrrr      uu   uu   ssss
+      pp        aa   aa   pp   pp   ii   rr        uu   uu      ssss
+      pp          aaaaa   ppppp     ii   rr          uuuuu   sssss
+                          pp
+                          pp
+
+
+  Papirus icon theme for GTK
+  https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk
+
+
+EOF
+
+temp_dir=$(mktemp -d)
+
+echo "=> Getting the latest version from GitHub ..."
+curl --progress-bar -Lfo /tmp/papirus-icon-theme-gtk.tar.gz \
+  https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk/archive/master.tar.gz
+echo "=> Unpacking archive ..."
+tar -xzf /tmp/papirus-icon-theme-gtk.tar.gz -C "$temp_dir"
+echo "=> Deleting old Papirus icon theme ..."
+rm -rf ~/.icons/Papirus-GTK ~/.icons/Papirus-Dark-GTK
+echo "=> Installing ..."
 mkdir -p ~/.icons
-cp -R /tmp/papirus-icon-theme-gtk-master/{Papirus-GTK,Papirus-Dark-GTK} ~/.icons/
-echo "Delete cache ..."
-rm -rf /tmp/papiru*
-echo "Done!"
+cp --no-preserve=mode,ownership -r \
+  "$temp_dir/papirus-icon-theme-gtk-master/Papirus-GTK" \
+  "$temp_dir/papirus-icon-theme-gtk-master/Papirus-Dark-GTK" ~/.icons/
+echo "=> Clearing cache ..."
+rm -rf /tmp/papirus-icon-theme-gtk.tar.gz "$temp_dir"
+echo "=> Done!"
diff --git a/install-papirus-root.sh b/install-papirus-root.sh
index c1503b1dea..607aaf90d3 100755
--- a/install-papirus-root.sh
+++ b/install-papirus-root.sh
@@ -1,15 +1,39 @@
-#!/usr/bin/env bash
-echo "Papirus icon theme for GTK"
-! which 7za > /dev/null 2>&1 && { echo "Please install p7zip-full"; exit 1; }
-echo "Download new version from GitHub ..."
-wget -c https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk/archive/master.zip -O /tmp/papirus-icon-theme-gtk.zip
-echo "Unpack archive ..."
-7za x /tmp/papirus-icon-theme-gtk.zip -o/tmp/ > /dev/null
-echo "Delete old Papirus icon theme ..."
-sudo rm -rf /usr/share/icons/{Papirus-GTK,Papirus-Dark-GTK}
-echo "Installing ..."
-sudo cp -R /tmp/papirus-icon-theme-gtk-master/{Papirus-GTK,Papirus-Dark-GTK} /usr/share/icons/
-sudo chmod -R 755 /usr/share/icons/{Papirus-GTK,Papirus-Dark-GTK}
-echo "Delete cache ..."
-rm -rf /tmp/papiru*
-echo "Done!"
+#!/bin/sh
+
+set -e
+
+cat <<- 'EOF'
+
+
+
+      ppppp                         ii
+      pp   pp     aaaaa   ppppp          rr  rrr   uu   uu     sssss
+      ppppp     aa   aa   pp   pp   ii   rrrr      uu   uu   ssss
+      pp        aa   aa   pp   pp   ii   rr        uu   uu      ssss
+      pp          aaaaa   ppppp     ii   rr          uuuuu   sssss
+                          pp
+                          pp
+
+
+  Papirus icon theme for GTK
+  https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk
+
+
+EOF
+
+temp_dir=$(mktemp -d)
+
+echo "=> Getting the latest version from GitHub ..."
+curl --progress-bar -Lfo /tmp/papirus-icon-theme-gtk.tar.gz \
+  https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk/archive/master.tar.gz
+echo "=> Unpacking archive ..."
+tar -xzf /tmp/papirus-icon-theme-gtk.tar.gz -C "$temp_dir"
+echo "=> Deleting old Papirus icon theme ..."
+sudo rm -rf /usr/share/icons/Papirus-GTK /usr/share/icons/Papirus-Dark-GTK
+echo "=> Installing ..."
+sudo cp --no-preserve=mode,ownership -r \
+  "$temp_dir/papirus-icon-theme-gtk-master/Papirus-GTK" \
+  "$temp_dir/papirus-icon-theme-gtk-master/Papirus-Dark-GTK" /usr/share/icons/
+echo "=> Clearing cache ..."
+rm -rf /tmp/papirus-icon-theme-gtk.tar.gz "$temp_dir"
+echo "=> Done!"
diff --git a/remove-papirus.sh b/remove-papirus.sh
index bb4080df26..c53fccac3d 100755
--- a/remove-papirus.sh
+++ b/remove-papirus.sh
@@ -1,5 +1,27 @@
-#!/usr/bin/env bash
-echo "Remove Papirus icon theme for GTK"
-sudo rm -rf /usr/share/icons/{Papirus-GTK,Papirus-Dark-GTK}
-rm -rf ~/.icons/{Papirus-GTK,Papirus-Dark-GTK}
-echo "Done!"
+#!/bin/sh
+
+set -e
+
+cat <<- 'EOF'
+
+
+
+      ppppp                         ii
+      pp   pp     aaaaa   ppppp          rr  rrr   uu   uu     sssss
+      ppppp     aa   aa   pp   pp   ii   rrrr      uu   uu   ssss
+      pp        aa   aa   pp   pp   ii   rr        uu   uu      ssss
+      pp          aaaaa   ppppp     ii   rr          uuuuu   sssss
+                          pp
+                          pp
+
+
+  Papirus icon theme for GTK
+  https://github.com/PapirusDevelopmentTeam/papirus-icon-theme-gtk
+
+
+EOF
+
+echo "=> Removing Papirus icon theme for GTK ..."
+sudo rm -rf /usr/share/icons/Papirus-GTK /usr/share/icons/Papirus-Dark-GTK
+rm -rf ~/.icons/Papirus-GTK ~/.icons/Papirus-Dark-GTK
+echo "=> Done!"