meh

2 files changed, 2 insertions, 47 deletions

diff --git a/unrpyc/Makefile b/unrpyc/Makefile
deleted file mode 100644
index 3259d12..0000000
--- a/unrpyc/Makefile
+++ /dev/null
@@ -1,46 +0,0 @@
-GZIP := $(shell ./find-gzip.sh)
-
-JSON := script.json script.json.gz imachine.json imachine.json.gz ui-strings.json ui-strings.json.gz ui-strings_FR.json ui-strings_FR.json.gz
-
-all: $(JSON)
-
-%.json.gz: %.json
-	$(GZIP) -c $< > $@
-	touch $< $@
-
-script.json: $(patsubst %.rpyc,%.json,$(wildcard script-*.rpyc))
-	cat script-*.json > script.json
-	sed -i -e 's/^/{/;s/,$$/}/' script.json
-
-%.json: %.json.o
-	uglifyjs $< --expr > $@
-
-ui-strings.json.o ui-strings_FR.json.o: ui-strings%.json.o: ui-strings%.rpyc *.py
-	python3 unrpyc.py --clobber $< $@
-	sed -i -e 's/    \["init_language", "[a-z]*", \],//;s/^\]}$$/}/' $@
-
-ui_settings.json.o: ui_settings.rpyc *.py
-	python3 unrpyc.py --clobber $< --ignore-python $@
-	sed -i -e 's/,,/,/g;/: *,$$/d' $@
-
-%.json.o: %.rpyc *.py
-	python3 unrpyc.py --clobber $< $@
-
-script-%.json: script-%.json.o
-	uglifyjs $< --expr > $@
-	sed -i -e 's/^{//;s/}$$/,/' $@
-
-clean:
-	$(RM) *.json*
-
-test: all
-	jshint --show-non-errors *.json
-
-install: all
-	[ -d ../www/json ] || mkdir ../www/json
-	cp -f $(JSON) ../www/json
-
-uninstall:
-	$(RM) ../www/json/*
-
-.PHONY: all clean test install
diff --git a/unrpyc/find-gzip.sh b/unrpyc/find-gzip.sh
index 2c2e51d..c9e8e00 100755
--- a/unrpyc/find-gzip.sh
+++ b/unrpyc/find-gzip.sh
@@ -1,9 +1,10 @@
 #!/bin/sh
 if command -v zopfli; then
   :
-elif command -v gzip; then
+elif G=$(command -v gzip); [[ "$G" ]]; then
   echo >&2 "Consider obtaining zopfli (https://github.com/Hello71/zopfli) for higher"
   echo >&2 "compression ratios (about 5% decrease in size of script.json.gz)."
+  echo "$G" -9
 else
   echo >&2 "Could not find zopfli or gzip, aborting."
   exit 1