Skip to content
Snippets Groups Projects
Commit 946467a9 authored by Auri's avatar Auri
Browse files

patch ordering of compat elements

parent e0ce3f2a
No related branches found
No related tags found
1 merge request!46WIP: Rewrite
...@@ -530,6 +530,7 @@ declare -f -t trap_add ...@@ -530,6 +530,7 @@ declare -f -t trap_add
tempdir() { tempdir() {
([ "$TMPDIR" ] && echo "$TMPDIR") || ([ "$TMP" ] && echo "$TMP") || ([ "$TEMP" ] && echo "$TEMP") || echo "/tmp" ([ "$TMPDIR" ] && echo "$TMPDIR") || ([ "$TMP" ] && echo "$TMP") || ([ "$TEMP" ] && echo "$TEMP") || echo "/tmp"
} }
TMPDIR="$(tempdir)"
prefix() { prefix() {
# TODO: this is fragile and not bullet-proof # TODO: this is fragile and not bullet-proof
...@@ -1157,14 +1158,15 @@ do ...@@ -1157,14 +1158,15 @@ do
done done
shift "$(($OPTLIND - 1))" shift "$(($OPTLIND - 1))"
TMPDIR=$(tempdir)
DOMAIN=$(prepare_domain "$DOMAIN") DOMAIN=$(prepare_domain "$DOMAIN")
if ! [ -t 2 ]; then if ! [ -t 2 ]; then
# stdout not a tty, force disable colors # stdout not a tty, force disable colors
COLORS=0 COLORS=0
fi fi
debug "TMPDIR=$TMPDIR"
debug "PREFIX=$PREFIX" debug "PREFIX=$PREFIX"
debug "RUNTIMEDIR=$RUNTIMEDIR"
debug "after getopts" debug "after getopts"
debug "VERBOSE=$VERBOSE" debug "VERBOSE=$VERBOSE"
debug "COLORS=$COLORS" debug "COLORS=$COLORS"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment