diff options
author | Mason Larobina <mason.larobina@gmail.com> | 2009-11-29 19:00:06 +0800 |
---|---|---|
committer | Mason Larobina <mason.larobina@gmail.com> | 2009-11-29 19:00:06 +0800 |
commit | 3eb6abf97a1e04a0c9102329b25b300fd484906b (patch) | |
tree | cbc9412a70a5ae5354b76214b279ea6e9387eb36 /examples | |
parent | 06dd36b6656e272c52b9628dfebc24d4c727b34a (diff) |
Revert "Merge branch 'security' of git://lug.rose-hulman.edu/~spenceal/uzbl into experimental"
This reverts commit e1ffb7652d256efdbb7a145f39b0289ebb523d34, reversing
changes made to f7eeee9955f99d4acbfc90c7dc00b50767a15e07.
Diffstat (limited to 'examples')
-rwxr-xr-x | examples/data/uzbl/scripts/clipboard.sh | 2 | ||||
-rwxr-xr-x | examples/data/uzbl/scripts/download.sh | 4 | ||||
-rwxr-xr-x | examples/data/uzbl/scripts/scheme.py | 5 | ||||
-rwxr-xr-x | examples/data/uzbl/scripts/yank.sh | 7 |
4 files changed, 10 insertions, 8 deletions
diff --git a/examples/data/uzbl/scripts/clipboard.sh b/examples/data/uzbl/scripts/clipboard.sh index d493774..60567d3 100755 --- a/examples/data/uzbl/scripts/clipboard.sh +++ b/examples/data/uzbl/scripts/clipboard.sh @@ -11,7 +11,7 @@ url="$7" selection=`$clip -o` case $action in - "yank" ) echo -n "$url" | $clip;; + "yank" ) echo -n "$url" | eval "$clip";; "goto" ) echo "uri $selection" > "$fifo";; * ) echo "clipboard.sh: invalid action";; esac diff --git a/examples/data/uzbl/scripts/download.sh b/examples/data/uzbl/scripts/download.sh index 55b0cb2..c8eb6ba 100755 --- a/examples/data/uzbl/scripts/download.sh +++ b/examples/data/uzbl/scripts/download.sh @@ -16,7 +16,7 @@ test "x$url" = "x" && { echo "you must supply a url! ($url)"; exit 1; } # only changes the dir for the $get sub process if echo "$url" | grep -E '.*\.torrent' >/dev/null; then - ( cd "$dest"; $GET "$url" ) + ( cd "$dest"; eval "$GET" "$url") else - ( cd "$dest"; $GET "$url" ) + ( cd "$dest"; eval "$GET" "$url") fi diff --git a/examples/data/uzbl/scripts/scheme.py b/examples/data/uzbl/scripts/scheme.py index 0916466..a54476f 100755 --- a/examples/data/uzbl/scripts/scheme.py +++ b/examples/data/uzbl/scripts/scheme.py @@ -16,9 +16,8 @@ if __name__ == '__main__': uri = sys.argv[8] u = urlparse.urlparse(uri) if u.scheme == 'mailto': - detach_open(['xterm', '-e', 'mail', u.path]) + detach_open(['xterm', '-e', 'mail %r' % u.path]) elif u.scheme == 'xmpp': - # Someone check for safe arguments to gajim-remote detach_open(['gajim-remote', 'open_chat', uri]) elif u.scheme == 'git': - detach_open(['git', 'clone', '--', uri], cwd=os.path.expanduser('~/src')) + detach_open(['git', 'clone', uri], cwd=os.path.expanduser('~/src')) diff --git a/examples/data/uzbl/scripts/yank.sh b/examples/data/uzbl/scripts/yank.sh index 6785d64..376b7e2 100755 --- a/examples/data/uzbl/scripts/yank.sh +++ b/examples/data/uzbl/scripts/yank.sh @@ -9,6 +9,9 @@ clip=xclip which $clip &>/dev/null || exit 1 -[ "$9" = primary -o "$9" = secondary -o "$9" = clipboard ] || exit 2 +[ "x$9" = xprimary -o "x$9" = xsecondary -o "x$9" = xclipboard ] || exit 2 -echo -n "$8" | $clip -selection $9 +value=`eval "echo -n \\${$8}"` # bash: value = ${!8} + +echo "echo -n '${value}' | $clip -selection $9" +echo -n "'${value}' | $clip -selection $9" |