gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-21 05:18:12 +01:00
Code Issues Projects Releases Wiki Activity

Check for existence of base64(1) before 'make dist'

Browse Source
This commit is contained in:
Kris Maglione
2009-11-02 16:49:52 -05:00
parent 108f467fe4
commit 8224540d26
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/Makefile
View File

@@ -38,6 +38,7 @@ BUILD_DIR = build.$(VERSION).$(OS)
AWK = awk AWK = awk
CURL = curl CURL = curl
B64ENCODE = base64
.SILENT: .SILENT:
@@ -79,6 +80,9 @@ release: $(XPI) $(RDF)
# This is not for you! # This is not for you!
dist: $(XPI) dist: $(XPI)
@echo DIST $(XPI) $(GOOGLE) @echo DIST $(XPI) $(GOOGLE)
set -e; \
which $$(echo $(B64ENCODE) | $(AWK) '{print $1}') >/dev/null; \
\
proj=$$(echo -n $(NAME) | sed 's/\(.\).*/\1/' | tr a-z A-Z); \ proj=$$(echo -n $(NAME) | sed 's/\(.\).*/\1/' | tr a-z A-Z); \
proj="$$proj$$(echo $(NAME) | sed 's/.//')"; \ proj="$$proj$$(echo $(NAME) | sed 's/.//')"; \
[ -z "$$summary" ] && summary="$$proj $(VERSION) Release"; \ [ -z "$$summary" ] && summary="$$proj $(VERSION) Release"; \
@@ -90,7 +94,7 @@ dist: $(XPI)
done; \ done; \
$(CURL) "$$@" --form-string "summary=$$summary" \ $(CURL) "$$@" --form-string "summary=$$summary" \
-F "filename=@$(XPI)" \ -F "filename=@$(XPI)" \
-H "Authorization: Basic $$(echo -n "$(GOOGLE_USER):$(GOOGLE_PASS)" | base64)" \ -H "Authorization: Basic $$(echo -n "$(GOOGLE_USER):$(GOOGLE_PASS)" | $(B64ENCODE))" \
-i "$(GOOGLE)" | sed -n '/^Location/{p;q}' -i "$(GOOGLE)" | sed -n '/^Location/{p;q}'
$(RDF): $(RDF_IN) Makefile $(RDF): $(RDF_IN) Makefile

12
common/content/util.js
View File

@@ -328,14 +328,14 @@ const util = { //{{{
zip.open(FILE.file, io.MODE_CREATE | io.MODE_WRONLY | io.MODE_TRUNCATE); zip.open(FILE.file, io.MODE_CREATE | io.MODE_WRONLY | io.MODE_TRUNCATE);
function addURIEntry(file, uri) function addURIEntry(file, uri)
zip.addEntryChannel(PATH + file, TIME, 9, zip.addEntryChannel(PATH + file, TIME, 9,
services.get("io").newChannel(uri, null, null), services.get("io").newChannel(uri, null, null), false);
false);
function addDataEntry(file, data) // Inideal to an extreme. function addDataEntry(file, data) // Inideal to an extreme.
addURIEntry(file, "data:text/plain;charset=UTF-8," + encodeURI(data)); addURIEntry(file, "data:text/plain;charset=UTF-8," + encodeURI(data));
let empty = util.Array.toObject( let empty = util.Array.toObject(
"area base basefont br col frame hr img input isindex link meta param" "area base basefont br col frame hr img input isindex link meta param"
.split(" ").map(Array.concat)); .split(" ").map(Array.concat));
let chrome = {}; let chrome = {};
for (let [file,] in Iterator(services.get("liberator:").FILE_MAP)) for (let [file,] in Iterator(services.get("liberator:").FILE_MAP))
{ {
@@ -420,10 +420,10 @@ const util = { //{{{
}, },
/** /**
* Sends a synchronous HTTP request to <b>url</b> and returns the * Sends a synchronous or asynchronous HTTP request to <b>url</b> and
* XMLHttpRequest object. If <b>callback</b> is specified the request is * returns the XMLHttpRequest object. If <b>callback</b> is specified the
* asynchronous and the <b>callback</b> is invoked with the object as its * request is asynchronous and the <b>callback</b> is invoked with the
* argument. * object as its argument.
* *
* @param {string} url * @param {string} url
* @param {function(XMLHttpRequest)} callback * @param {function(XMLHttpRequest)} callback