From e85f40193fbd8ca0bfd8636fa71a343eb9a8c27a Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Fri, 9 Nov 2018 07:59:14 -0600 Subject: [PATCH 1/4] Enable local install, mirroring approach in icons repo. --- README.md | 6 ++++++ install.sh | 14 +++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index f69d851..849170e 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,12 @@ Use the scripts to install the latest version directly from this repo (independe wget -qO- https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh | sh ``` +##### HOME directory + +``` +wget -qO- https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh | PREFIX="$HOME/.local" sh +``` + #### Uninstall ``` diff --git a/install.sh b/install.sh index ae73e0b..6d45573 100755 --- a/install.sh +++ b/install.sh @@ -32,8 +32,16 @@ _msg() { _rm() { # removes parent directories if empty - sudo rm -rf "$1" - sudo rmdir -p "$(dirname "$1")" 2>/dev/null || true + _sudo rm -rf "$1" + _sudo rmdir -p "$(dirname "$1")" 2>/dev/null || true +} + +_sudo() { + if [ -w "$PREFIX/share" ]; then + "$@" + else + sudo "$@" + fi } _download() { @@ -68,7 +76,7 @@ _uninstall() { _install() { _msg "Installing ..." - sudo cp -R \ + _sudo cp -R \ "$temp_dir/$gh_repo-$TAG/aurorae" \ "$temp_dir/$gh_repo-$TAG/color-schemes" \ "$temp_dir/$gh_repo-$TAG/konsole" \ From 7cdca8bd5ab11643c964b2ccc76fa1c5910223da Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Sat, 10 Nov 2018 16:51:34 -0600 Subject: [PATCH 2/4] Revert "Enable local install, mirroring approach in icons repo." This reverts commit e85f40193fbd8ca0bfd8636fa71a343eb9a8c27a. --- README.md | 6 ------ install.sh | 14 +++----------- 2 files changed, 3 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 849170e..f69d851 100644 --- a/README.md +++ b/README.md @@ -45,12 +45,6 @@ Use the scripts to install the latest version directly from this repo (independe wget -qO- https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh | sh ``` -##### HOME directory - -``` -wget -qO- https://raw.githubusercontent.com/PapirusDevelopmentTeam/arc-kde/master/install.sh | PREFIX="$HOME/.local" sh -``` - #### Uninstall ``` diff --git a/install.sh b/install.sh index 6d45573..ae73e0b 100755 --- a/install.sh +++ b/install.sh @@ -32,16 +32,8 @@ _msg() { _rm() { # removes parent directories if empty - _sudo rm -rf "$1" - _sudo rmdir -p "$(dirname "$1")" 2>/dev/null || true -} - -_sudo() { - if [ -w "$PREFIX/share" ]; then - "$@" - else - sudo "$@" - fi + sudo rm -rf "$1" + sudo rmdir -p "$(dirname "$1")" 2>/dev/null || true } _download() { @@ -76,7 +68,7 @@ _uninstall() { _install() { _msg "Installing ..." - _sudo cp -R \ + sudo cp -R \ "$temp_dir/$gh_repo-$TAG/aurorae" \ "$temp_dir/$gh_repo-$TAG/color-schemes" \ "$temp_dir/$gh_repo-$TAG/konsole" \ From 4029f15558ec54911d4d4d81607a37e4fb234981 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Sat, 10 Nov 2018 16:54:05 -0600 Subject: [PATCH 3/4] Makefile wip --- Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8a1ee1f..3d46513 100644 --- a/Makefile +++ b/Makefile @@ -14,6 +14,12 @@ install: mkdir -p $(DESTDIR)$(PREFIX)/share cp -R $(THEMES) $(DESTDIR)$(PREFIX)/share +local-install: install + mkdir -p $(HOME)/.config/Kvantum + mv $(DESTDIR)$(PREFIX)/share/Kvantum/Arc $(HOME)/.config/Kvantum + mv $(DESTDIR)$(PREFIX)/share/Kvantum/ArcDark $(HOME)/.config/Kvantum + mv $(DESTDIR)$(PREFIX)/share/Kvantum/ArcDarker $(HOME)/.config/Kvantum + uninstall: -rm -rf $(DESTDIR)$(PREFIX)/share/aurorae/themes/Arc -rm -rf $(DESTDIR)$(PREFIX)/share/aurorae/themes/Arc-Dark @@ -51,7 +57,7 @@ undo_release: _get_version -git push --delete origin $(VERSION) -.PHONY: all install uninstall _get_version dist release undo_release +.PHONY: all install local-install uninstall _get_version dist release undo_release # .BEGIN is ignored by GNU make so we can use it as a guard .BEGIN: From 85496356c071b9e84da6fd16ba756f2e15a6e365 Mon Sep 17 00:00:00 2001 From: Jacob MacDonald Date: Sat, 10 Nov 2018 17:58:33 -0600 Subject: [PATCH 4/4] Add local-uninstall target. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3d46513..b0e2c6f 100644 --- a/Makefile +++ b/Makefile @@ -40,6 +40,11 @@ uninstall: -rm -rf $(DESTDIR)$(PREFIX)/share/yakuake/skins/arc -rm -rf $(DESTDIR)$(PREFIX)/share/yakuake/skins/arc-dark +local-uninstall: uninstall + -rm -rf $(HOME)/.config/Kvantum/Arc + -rm -rf $(HOME)/.config/Kvantum/ArcDark + -rm -rf $(HOME)/.config/Kvantum/ArcDarker + _get_version: $(eval VERSION := $(shell git show -s --format=%cd --date=format:%Y%m%d HEAD)) @echo $(VERSION) @@ -57,7 +62,7 @@ undo_release: _get_version -git push --delete origin $(VERSION) -.PHONY: all install local-install uninstall _get_version dist release undo_release +.PHONY: all install local-install uninstall local-uninstall _get_version dist release undo_release # .BEGIN is ignored by GNU make so we can use it as a guard .BEGIN: