diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2010-12-01 09:59:02 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2010-12-01 09:59:02 -0700 |
| commit | 0821955f4d3eb4fbaf5eafcf96ca6f094122d0fc (patch) | |
| tree | 29318a7937c0d12a45bf2aa2c0fedbb0a33afa60 | |
| parent | 212ab31b4b3161995968a312546e156cafa4e8d1 (diff) | |
| parent | 00880e3ac1be1b4890244bf467e00f6ec890b7f3 (diff) | |
Merge remote branch 'jspricke/master' into experimental
| -rw-r--r-- | .gitignore | 1 | ||||
| -rwxr-xr-x | examples/data/scripts/download.sh | 2 | ||||
| -rwxr-xr-x | examples/data/scripts/load_url_from_history.sh | 2 | ||||
| -rwxr-xr-x | examples/data/scripts/session.sh | 1 | ||||
| -rw-r--r-- | examples/data/scripts/util/dmenu.sh | 2 |
5 files changed, 4 insertions, 4 deletions
@@ -3,3 +3,4 @@ uzbl-core *.pyc *~ tags +uzbl-cookie-manager diff --git a/examples/data/scripts/download.sh b/examples/data/scripts/download.sh index cc3cd99..3b5d980 100755 --- a/examples/data/scripts/download.sh +++ b/examples/data/scripts/download.sh @@ -5,7 +5,7 @@ . $UZBL_UTIL_DIR/uzbl-dir.sh # Some sites block the default wget --user-agent.. -GET="wget --user-agent=Firefox --content-disposition --load-cookies=$UZBL_COOKIE_JAR" +GET="wget --user-agent=Firefox --content-disposition --load-cookies=$UZBL_COOKIE_FILE" url="$1" diff --git a/examples/data/scripts/load_url_from_history.sh b/examples/data/scripts/load_url_from_history.sh index 4782cca..59ad492 100755 --- a/examples/data/scripts/load_url_from_history.sh +++ b/examples/data/scripts/load_url_from_history.sh @@ -12,7 +12,7 @@ DMENU_OPTIONS="xmms vertical resize" # goto=$(awk '{print $3}' $history_file | sort -u | dmenu -i) if [ -z "$DMENU_HAS_VERTICAL" ]; then current=$(tail -n 1 "$UZBL_HISTORY_FILE" | awk '{print $3}'); - goto=$((echo $current; awk '{print $3}' "$UZBL_HISTORY_FILE" | grep -v "^$current\$" | sort -u) | $DMENU) + goto=$( (echo $current; awk '{print $3}' "$UZBL_HISTORY_FILE" | grep -v "^$current\$" | sort -u) | $DMENU) else # choose an item in reverse order, showing also the date and page titles # pick the last field from the first 3 fields. this way you can pick a url (prefixed with date & time) or type just a new url. diff --git a/examples/data/scripts/session.sh b/examples/data/scripts/session.sh index eb01f51..36e0c19 100755 --- a/examples/data/scripts/session.sh +++ b/examples/data/scripts/session.sh @@ -51,7 +51,6 @@ case $act in else for url in $urls; do $UZBL --uri "$url" & - disown done mv "$UZBL_SESSION_FILE" "$UZBL_SESSION_FILE~" fi diff --git a/examples/data/scripts/util/dmenu.sh b/examples/data/scripts/util/dmenu.sh index f789178..1bac6e9 100644 --- a/examples/data/scripts/util/dmenu.sh +++ b/examples/data/scripts/util/dmenu.sh @@ -67,7 +67,7 @@ if dmenu --help 2>&1 | grep -q '\[-xs\]'; then fi # Detect the vertical patch -if dmenu --help 2>&1 | grep -q '\[-l <lines>\]'; then +if dmenu --help 2>&1 | grep -q '\[-l lines\]'; then # Default to 10 lines if [ -z "$DMENU_LINES" ]; then DMENU_LINES=10 |