aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <karel.koci@nic.cz>2017-12-04 07:21:04 +0100
committerKarel Kočí <karel.koci@nic.cz>2017-12-04 07:21:04 +0100
commit6cc31a2b88476fe42b7bca369d0b782bf9b0c7cc (patch)
tree7fb36bc2ac72e194a0d84699fff35c598c1eec31
parentefc78eeb586cb159f50cff4f88d245328a331bcb (diff)
downloadmyconfigs-6cc31a2b88476fe42b7bca369d0b782bf9b0c7cc.tar.gz
myconfigs-6cc31a2b88476fe42b7bca369d0b782bf9b0c7cc.tar.bz2
myconfigs-6cc31a2b88476fe42b7bca369d0b782bf9b0c7cc.zip
Drop surf-menu as it's now part of mysurf
-rwxr-xr-xinstall1
-rwxr-xr-xlocal/bin/surf-menu60
2 files changed, 0 insertions, 61 deletions
diff --git a/install b/install
index 1a23184..8f96cc6 100755
--- a/install
+++ b/install
@@ -102,7 +102,6 @@ fi
if ask "Install Surf configuration"; then
inst surf/script.js ~/.surf/script.js
inst surf/styles/default.css ~/.surf/styles/default.css
- inst local/bin/surf-menu ~/.local/bin/surf-menu
fi
if ask "Install MPD configuration"; then
diff --git a/local/bin/surf-menu b/local/bin/surf-menu
deleted file mode 100755
index b2e0111..0000000
--- a/local/bin/surf-menu
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-set -e
-
-BOOKMARDS=~/notes/bookmarks.md
-
-run() {
- echo "Run $1"
- echo "$1" | grep -qE '^~?/' || true
- echo $?
- if echo "$1" | grep -qE '^\?'; then # We do search on duckduckgo
-
- surf "https://duckduckgo.com/?q=${L#?}&t=surf&kk=-1&ia=web" &
-
- elif echo "$1" | grep -qE '^~?/'; then # This is local path
-
- surf "${1/#\~/$HOME}" &
-
- elif echo "$1" | grep -qE '^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+'; then # This ipv4 address
-
- surf "$1" &
-
- else # We follow address
-
- LPROTOCOL="$(echo "$1" | sed -n 's#^\([^:]*\)://.*#\1#p')"
- LHOST="$(echo "$1" | sed -n 's#^[^:]*://##;s#^\([^/]\+\)/\?.*#\1#p')"
- LPATH="$(echo "$1" | sed 's#^[^:]*://##;s#^[^/]\+/\?##')"
-
- if ! getent hosts "$LHOST" >/dev/null; then
- if getent hosts "$LHOST.cz" >/dev/null; then
- LHOST="$LHOST.cz"
- elif getent hosts "$LHOST.org" >/dev/null; then
- LHOST="$LHOST.org"
- elif getent hosts "$LHOST.com" >/dev/null; then
- LHOST="$LHOST.com"
- fi
- # TODO what to do when we can't expand it?
- fi
- # Decide on protocol (if connection to 443 is not possible then use http otherwise https)
- if [ -z "$LPROTOCOL" ]; then # We already have protocol (given explicitly)
- if nc -z -w1 "$LHOST" 443 2>/dev/null; then
- LPROTOCOL="https"
- else
- LPROTOCOL="http"
- fi
- fi
-
- surf "$LPROTOCOL://$LHOST/$LPATH" &
-
- fi
-}
-
-if [ -n "$1" ]; then
- run "$1"
- exit
-else
- # Note: Bookmarks starts with '* '
- sed -n 's/\* //p' "$BOOKMARDS" | dmenu -p 'surf' | while read L; do
- run "$L"
- done
-fi