From e594190eb55a88b729a10c622a40e769dff4b31e Mon Sep 17 00:00:00 2001 From: ch1p Date: Wed, 20 Dec 2017 15:45:32 +0300 Subject: update Makefile, update readme --- Makefile | 35 ++++++++++++++++++----------------- README.md | 23 +++++++++++------------ 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/Makefile b/Makefile index b59c467..9197e19 100644 --- a/Makefile +++ b/Makefile @@ -90,26 +90,27 @@ $(GENERATED)/.submodules: mkdir "$(GENERATED)" touch "$(GENERATED)/.submodules" -$(GENERATED)/.prepare: $(GENERATED)/.submodules - rm -rf $(foreach i,xfwm4 metacity-1 openbox-3 xfce-notify-4.0 index.theme,$(BASE)/$(i)) - $(MAKE) -C "$(BASE)" install DESTDIR="$(GENERATED)" - mv "$(GENERATED)/usr/share/themes/Numix" "$(GENERATED)/Numix" - rm -rf "$(GENERATED)/usr" - for f in $$(find $(GENERATED)/Numix -maxdepth 1 -type d);do \ - cd "$$f"; \ - [ -d "$$f/dist" ] && mv -f "$$f"/dist/* "$$f"/ || true; \ - done - find $(GENERATED)/Numix -empty -delete - touch "$(GENERATED)/.prepare" - -$(GENERATED)/.success-Shiki-%: $(GENERATED)/.prepare - cp -r $(GENERATED)/Numix $(GENERATED)/Shiki-$* - find $(GENERATED)/Shiki-$* -type f -print0 | xargs -0 sed -i \ +$(GENERATED)/.success-Shiki-%: $(GENERATED)/.submodules + $(eval TEMP_DIR := $(shell mktemp -d)) + $(foreach SRC_DIR,src scripts Makefile,cp -r $(BASE)/$(SRC_DIR) $(TEMP_DIR)/$(SRC_DIR);) + find "$(TEMP_DIR)/src" -type f -iregex '.*\(\.css\|\.scss\|gtkrc\|\.svg\)$$' -print0 | xargs -0 sed -i \ -e 's/#d64937/#$(Shiki-$*_selected)/g' \ -e 's/#f0544c/#$(Shiki-$*_selected)/g' \ -e 's/#444*/#$(Shiki-$*_dark_bg)/g' - find $(GENERATED)/Shiki-$* -maxdepth 1 -not -type d -print0 | xargs -0 rm -f - rm -rf $(GENERATED)/Shiki-$*/Shiki-$* + find "$(TEMP_DIR)/src/assets" -type f -iname "*png" -delete + sed -i 's/#f1544d/#$(Shiki-$*_selected)/g' "$(TEMP_DIR)/src/assets/all-assets.svg" + pushd "$(TEMP_DIR)/scripts";\ + ./render-assets.sh;\ + popd + mkdir "$(TEMP_DIR)/generated" + $(MAKE) -C "$(TEMP_DIR)" install DESTDIR="$(TEMP_DIR)/generated" + mv "$(TEMP_DIR)/generated/usr/share/themes/Numix" "$(GENERATED)/Shiki-$*" + rm -rf "$(TEMP_DIR)" + for f in $$(find $(GENERATED)/Shiki-$* -maxdepth 1 -type d);do \ + cd "$$f"; \ + [ -d "$$f/dist" ] && mv -f "$$f"/dist/* "$$f"/ || true; \ + done + find $(GENERATED)/Shiki-$* -empty -delete touch "$(GENERATED)/.success-Shiki-$*" $(GENERATED)/.success: $(foreach COLOR,$(COLORS),$(GENERATED)/.success-Shiki-$(COLOR)) diff --git a/README.md b/README.md index 0b39417..6ceb0aa 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,4 @@ -**This project is now abandoned. When GNOME developers decide to stop breaking -things every minor release, maybe then it'll be worth maintaining. But I'm -done with themes, sorry. Anyone is permitted to fork and maintain this.** +**This is updated and maintained fork of [Somasis's shiki-colors-revival](https://github.com/somasis/shiki-colors-revival).** # shiki-colors-revival This consists mostly of a script that modifies the original Numix theme's @@ -23,6 +21,7 @@ GPL-3, Xfwm4 and Metacity are GPL-2, Plank themes and build system are ISC) - `sed` - `git` - `make` +- `scss`, `sassc` - `gtk-engine-murrine`, needed for GTK2 themes - `xfwm4`, needed for Xfwm4 themes - `metacity`, or `marco` (`mutter` might work too) for the Metacity themes @@ -30,14 +29,14 @@ GPL-3, Xfwm4 and Metacity are GPL-2, Plank themes and build system are ISC) ## Downloading Either use `git` to clone this repository: - git clone https://github.com/Somasis/shiki-colors-revival + git clone https://github.com/gch1p/shiki-colors-revival or just [download the latest release](releases). ## Installing 1. Open a terminal in this repo's directory. 2. `make`, or run `make help` to see what else the Makefile can do. -3. `make install` as root +3. `make install` as root, or manually copy directories from `generated` to `~/.themes`. **Exherbo users**: There is an exheres in ::somasis; x11-themes/shiki-colors-revival. @@ -58,12 +57,12 @@ minor version of GTK3, again. We can make upstream do all the work. :) These are screenshots of the themes running on my Xfce desktop. -![Shiki-Brave](https://raw.githubusercontent.com/Somasis/shiki-colors-revival/master/screenshots/Shiki-Brave-Revival.png) -![Shiki-Human](https://raw.githubusercontent.com/Somasis/shiki-colors-revival/master/screenshots/Shiki-Human-Revival.png) -![Shiki-Illustrious](https://raw.githubusercontent.com/Somasis/shiki-colors-revival/master/screenshots/Shiki-Illustrious-Revival.png) -![Shiki-Noble](https://raw.githubusercontent.com/Somasis/shiki-colors-revival/master/screenshots/Shiki-Noble-Revival.png) -![Shiki-Wine](https://raw.githubusercontent.com/Somasis/shiki-colors-revival/master/screenshots/Shiki-Wine-Revival.png) -![Shiki-Wise](https://raw.githubusercontent.com/Somasis/shiki-colors-revival/master/screenshots/Shiki-Wise-Revival.png) +![Shiki-Brave](https://raw.githubusercontent.com/gch1p/shiki-colors-revival/master/screenshots/Shiki-Brave-Revival.png) +![Shiki-Human](https://raw.githubusercontent.com/gch1p/shiki-colors-revival/master/screenshots/Shiki-Human-Revival.png) +![Shiki-Illustrious](https://raw.githubusercontent.com/gch1p/shiki-colors-revival/master/screenshots/Shiki-Illustrious-Revival.png) +![Shiki-Noble](https://raw.githubusercontent.com/gch1p/shiki-colors-revival/master/screenshots/Shiki-Noble-Revival.png) +![Shiki-Wine](https://raw.githubusercontent.com/gch1p/shiki-colors-revival/master/screenshots/Shiki-Wine-Revival.png) +![Shiki-Wise](https://raw.githubusercontent.com/gch1p/shiki-colors-revival/master/screenshots/Shiki-Wise-Revival.png) ## Related @@ -83,5 +82,5 @@ can be found at [arc-colors-revival]. [shimmerproject]: http://github.com/shimmerproject [fredbird67]: http://xfce-look.org/usermanager/search.php?username=fredbird67 [GNOME Colors palette]: https://github.com/Somasis/gnome-colors-revival/blob/master/Palette.png -[releases]: https://github.com/Somasis/shiki-colors-revival/releases +[releases]: https://github.com/gch1p/shiki-colors-revival/releases [GNOME Colors]: https://code.google.com/p/gnome-colors -- cgit v1.2.3