projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
removed last hardcoded data in pem2openpgp; it seems to work with our test key.
[monkeysphere.git]
/
src
/
common
diff --git
a/src/common
b/src/common
index 51b04708e1e34ca13dbc4d9d4d0a591211200c4d..eb3a08343819bcec665b8387e950f661984086a5 100644
(file)
--- a/
src/common
+++ b/
src/common
@@
-19,6
+19,9
@@
SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
export SYSCONFIGDIR
SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
export SYSCONFIGDIR
+# monkeysphere version
+VERSION=__VERSION__
+
########################################################################
### UTILITY FUNCTIONS
########################################################################
### UTILITY FUNCTIONS
@@
-147,7
+150,7
@@
advance_date() {
local shortunits
# try things the GNU way first
local shortunits
# try things the GNU way first
- if date -d "$number $longunits" "$format" >
&/dev/null
; then
+ if date -d "$number $longunits" "$format" >
/dev/null 2>&1
; then
date -d "$number $longunits" "$format"
else
# otherwise, convert to (a limited version of) BSD date syntax:
date -d "$number $longunits" "$format"
else
# otherwise, convert to (a limited version of) BSD date syntax: