diff options
| author |  Brendan Taylor <whateley@gmail.com> | 2010-11-21 23:25:17 -0700 |
|---|---|---|
| committer | Brendan Taylor <whateley@gmail.com> | 2010-11-21 23:25:17 -0700 |
| commit | 2fbd3ecfd2697f5883228c1ff8ddae65a5e48322 (patch) | |
| tree | 5340c0d3912c2cda2b5d481070d86bd4b61652df /examples | |
| parent | f140884503c05d20bbd88114a1f1f10b6de067ef (diff) | |
| parent | e660b9de3f4331ebf171735b40eb12105218b2d7 (diff) | |
Merge branch 'dev/cleanup-scripts'
Conflicts:
src/uzbl-browser
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/config/config | 1 | ||||
| -rwxr-xr-x | examples/data/scripts/history.sh | 2 | ||||
| -rwxr-xr-x | examples/data/scripts/insert_bookmark.sh | 2 |
3 files changed, 2 insertions, 3 deletions
diff --git a/examples/config/config b/examples/config/config index 7c3a950..8189479 100644 --- a/examples/config/config +++ b/examples/config/config @@ -35,7 +35,6 @@ set set_status = set status_message = # Spawn path shortcuts. In spawn the first dir+path match is used in "dir1:dir2:dir3:executable" set scripts_dir = $XDG_DATA_HOME/uzbl:@prefix/share/uzbl/examples/data:scripts -set scripts_util_dir = @scripts_dir/util # === Hardcoded handlers ===================================================== diff --git a/examples/data/scripts/history.sh b/examples/data/scripts/history.sh index b8a15e0..0561fe9 100755 --- a/examples/data/scripts/history.sh +++ b/examples/data/scripts/history.sh @@ -2,6 +2,6 @@ . $UZBL_UTIL_DIR/uzbl-dir.sh -[ -w "$UZBL_HISTORY_FILE" ] || exit 1 +[ -w "$UZBL_HISTORY_FILE" ] || [ ! -a "$UZBL_HISTORY_FILE" ] || exit 1 echo $(date +'%Y-%m-%d %H:%M:%S')" $6 $7" >> $UZBL_HISTORY_FILE diff --git a/examples/data/scripts/insert_bookmark.sh b/examples/data/scripts/insert_bookmark.sh index bd6f1bd..65fb5c5 100755 --- a/examples/data/scripts/insert_bookmark.sh +++ b/examples/data/scripts/insert_bookmark.sh @@ -3,7 +3,7 @@ . $UZBL_UTIL_DIR/uzbl-dir.sh [ -d "$UZBL_DATA_DIR" ] || exit 1 -[ -w "$UZBL_BOOKMARKS_FILE" ] || exit 1 +[ -w "$UZBL_BOOKMARKS_FILE" ] || [ ! -a "$UZBL_BOOKMARKS_FILE" ] || exit 1 which zenity 2>&1 >/dev/null || exit 2 # replace tabs, they are pointless in titles and we want to use tabs as delimiter. |