1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-16 20:15:48 +01:00

Release 1.0 βeta 2.

This commit is contained in:
Kris Maglione
2010-10-02 16:35:38 -04:00
parent 8ab81562ba
commit 408e91db5e
4 changed files with 15 additions and 14 deletions

View File

@@ -6,7 +6,7 @@ BUILD_DATE = $(shell date "+%Y/%m/%d %H:%M:%S")
BASE = $(TOP)/../common
GOOGLE_PROJ = dactyl
GOOGLE = https://$(GOOGLE_PROJ).googlecode.com/files
VERSION = $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
VERSION ?= $(shell sed -n 's/.*em:version\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
UUID = $(shell sed -n 's/.*em:id\(>\|="\)\(.*\)["<].*/\2/p' $(TOP)/install.rdf | sed 1q)
LOCALEDIR = locale
@@ -108,14 +108,15 @@ install:
for dir in $(PROFILEPATHS); do \
test -f "$$dir/profiles.ini" && break; \
done; \
profile=$${PROFILE:-$$(sed 's/^$$/\#/' "$$dir/profiles.ini" |\
profile=$$(sed 's/^$$/\#/' "$$dir/profiles.ini" |\
awk -v"profile=$(PROFILE)" \
'BEGIN { RS="#" } index("\n" profile "\n", $$0) || !profile && /\nDefault=1/' |\
'BEGIN { RS="#" } \
index($$0, "\nName=" profile "\n") || !profile && /\nDefault=1/' |\
awk -F= '{ args[$$1] = $$2 } \
END {\
if (args["IsRelative"]) print ENVIRON["dir"] "/" args["Path"];\
else print args["Path"]\
}')}; \
}'); \
if ! test -d "$$profile"; then \
echo >&2 "Can't locate profile directory"; \
exit 1; \

View File

@@ -1405,7 +1405,7 @@ const Options = Module("options", {
completion.optionValue = function (context, name, op, curValue, completer) {
let opt = options.get(name);
completer = completer || opt.completer;
if (!completer)
if (!completer || !opt)
return;
try {