Removes old files, updates default homepage, and more makefile stuff

This commit is contained in:
sloumdrone 2019-10-14 20:25:32 -07:00
parent 7ed2b46b32
commit 59aa8a1ef2
4 changed files with 15 additions and 232 deletions

View File

@ -1,22 +1,26 @@
BINARY := bombadillo
man1dir := /usr/local/share/man/man1
#PKGS := $(shell go list ./... |grep -v /vendor)
VERSION := $(shell git describe --tags 2> /dev/null)
BUILD := $(shell date)
GOPATH ?= $(HOME)/go
GOPATH ?= ${HOME}/go
GOBIN ?= ${GOPATH}/bin
BUILD_PATH ?= ${GOBIN}
# Use a dateformat rather than -I flag since OSX
# does not support -I. It also doesn't support
# %:z - so settle for %z.
BUILD_TIME := ${shell date "+%Y-%m-%dT%H:%M%z"}
# If VERSION is empty or not deffined use the contents of the VERSION file
VERSION := ${shell git describe --tags 2> /dev/null}
ifndef VERSION
VERSION := $(shell cat ./VERSION)
VERSION := ${shell cat ./VERSION}
endif
LDFLAGS :=
# If an alternate configuration path is provided when make is run,
# include it as an ldflag
ifdef CONF_PATH
LDFLAGS := -ldflags "-s -X main.version=${VERSION} -X main.build=${BUILD} -X main.conf_path${conf_path}"
LDFLAGS := -ldflags "-s -X main.version=${VERSION} -X main.build=${BUILD_TIME} -X main.conf_path=${CONF_PATH}"
else
LDFLAGS := -ldflags "-s -X main.version=${VERSION} -X main.build=${BUILD}"
LDFLAGS := -ldflags "-s -X main.version=${VERSION} -X main.build=${BUILD_TIME}"
endif
.PHONY: test
@ -42,10 +46,11 @@ install-man: bombadillo.1
.PHONY: clean
clean:
@go clean -i
@rm ./bombadillo.1.gz 2> /dev/null
@rm -f ./bombadillo.1.gz 2> /dev/null
.PHONY: uninstall
uninstall: clean
@rm -f ${man1dir}/bombadillo.1.gz
@echo Removing ${BINARY}
@rm -f ${BUILD_PATH}/${BINARY}

View File

@ -1,162 +0,0 @@
i false null.host 70
i false null.host 70
i **** bombadillo **** false null.host 70
i false null.host 70
ibombadillo is a gopher client for the terminal. it functions as a pager false null.host 70
iwith a "full screen" terminal user interface. keys are mapped similarly false null.host 70
ito vim (as detailed below). source code can be downloaded from the link false null.host 70
iand is written in golang. linux and osx are fully supported for both arm false null.host 70
iand x86_64. false null.host 70
i false null.host 70
iin bombadillo, scroll down with 'j' and up with 'k'. this is being false null.host 70
ilisted here to facilitate easier viewing of the rest of this doc false null.host 70
ifor first time users. false null.host 70
i false null.host 70
i false null.host 70
isource code is available here: false null.host 70
hhttp://tildegit.org/sloum/bombadillo url:http://tildegit.org/sloum/bombadillo colorfield.space 70
i false null.host 70
iweb based documentation/links available here: false null.host 70
hhttps://rawtext.club/~sloum/bombadillo.html url:https://rawtext.club/~sloum/bombadillo.html colorfield.space 70
i false null.host 70
i false null.host 70
ito open the above link in bombadillo a user must enable the feature. to do so false null.host 70
ia user would ":set openhttp true". this will open the http based web link in false null.host 70
itheir default web browser. a user can change back to false at any time if false null.host 70
iprefer to not open non-gopher links. if a default web browser is not set, the false null.host 70
itrue value will still result in failure :( unfortunately, if you are in a false null.host 70
inon-graphical environment entiely (such as in a remote shell) you will likely false null.host 70
inot be able to open a web browser as lynx (or the like) are not generally false null.host 70
iset up to work as a system default browser.
i false null.host 70
ibombadillo uses, if it is available, the alternate terminal buffer. this will false null.host 70
ihelp keep your terminal clean when you exit as well as create a better full false null.host 70
iscreen experience in a terminal. a configuration flag to toggle this feature false null.host 70
iis in the works.
i false null.host 70
i false null.host 70
i** quick start ** false null.host 70
i false null.host 70
iupon opening bombadillo for the first time a user will be presented with this false null.host 70
iscreen and a top bar with the application title. to visit a page a user can false null.host 70
ienter a colon followed by a gopher url or a link number (shown on the active false null.host 70
ipage to the left of link text and to the right of the gopher type). For false null.host 70
iexample: false null.host 70
i false null.host 70
i:colorfield.space false null.host 70
i false null.host 70
iupon doing so the user will see the colorfield.space gopher page false null.host 70
iyou will see the ':' key come up a lot as it leads into many commands. false null.host 70
i false null.host 70
iyou can pass a url to bombadillo when opening it from the terminal. false null.host 70
idoing so will open the client directly to that url. for example: false null.host 70
i false null.host 70
i bombadillo gopher://colorfield.space false null.host 70
i false null.host 70
i false null.host 70
iA note on window resizing: false null.host 70
i false null.host 70
iIf you resize your terminal window the screen will wrap text in weird/wild false null.host 70
iways. Pressing any key when the screen is in this state will redraw the false null.host 70
iscreen and realign the text. false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i** hot keys ** false null.host 70
i false null.host 70
isome keys function as "hot keys". when pressed, they will initite an false null.host 70
iaction immediately. the following keys work as hot keys: false null.host 70
i false null.host 70
ikey behavior false null.host 70
i-------- -------------------------------------------------------------- false null.host 70
i q quit bombadillo false null.host 70
i b back (go back a place in browsing history if available) false null.host 70
i f forward (go forward a place in browsing history if available) false null.host 70
i j scroll down (if there is room to do so) false null.host 70
i k scroll up (if there is room to do so) false null.host 70
i G scroll to bottom (end) false null.host 70
i g scroll to top (home) false null.host 70
i d page down false null.host 70
i u page up false null.host 70
i B toggle bookmarks sidebar into or out of view false null.host 70
i : enter command mode false null.host 70
i SPC enter command mode false null.host 70
i TAB cycle window focus false null.host 70
i false null.host 70
i *window focus changes only have an effect if the bookmark window is open. false null.host 70
i Changing focus will allow the focused window to be scrolled while both false null.host 70
i windows are visible on screen. false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i** commands ** false null.host 70
i false null.host 70
ionce in command mode, the following commands are available: false null.host 70
i (most can function using just their first letter... ex: false null.host 70
i :q will quit false null.host 70
i :w . somefile.txt will save the current file as somefile.txt false null.host 70
i all current commands work this way in addition to their long form) false null.host 70
i false null.host 70
i false null.host 70
iaction syntax notes false null.host 70
i----------------- -------------------------------- --------------------- false null.host 70
iquit bombadillo :quit same as 'q' hot key false null.host 70
ivisit homepage :home set by homeurl option false null.host 70
ivisit help :help short version :? false null.host 70
isearch :search will ask for kwds false null.host 70
ivisit url :[url] valid gopher url false null.host 70
ivisit link :[number] link # on active page false null.host 70
iview bookmarks :bookmarks same as 'B' hot key false null.host 70
ivisit bookmark :bookmarks [number] valid bookmark # false null.host 70
iadd bookmark :add [url] [bookmark title] valid gopher url false null.host 70
iadd bookmark :add [link #] [bookmark title] link # on active page false null.host 70
iadd bookmark :add . [bookmark title] adds active page false null.host 70
idelete bookmark :delete [number] valid bookmark # false null.host 70
iset an option :set [option] [value] used for configuration false null.host 70
icheck an option :check [option name] used to check config false null.host 70
iwrite to file :write [url] [file name] valid gopher url false null.host 70
iwrite to file :write [link #] [file name] link # on active page false null.host 70
iwrite to file :write . [file name] saves active page false null.host 70
i false null.host 70
i *: navigating to a non-text gophertype will automaticall save false null.host 70
i files save to the path set by the 'saveurl' option (defaults false null.host 70
i to a user's Downloads folder in their home directory). false null.host 70
i **: search is entered on its own and will query the user for keywords false null.host 70
i and will then query the search service set as 'searchengine' false null.host 70
i (defaults to veronica2) false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i** configuartion ** false null.host 70
i false null.host 70
ivarious configuartion options can be set via the 'set' command. false null.host 70
ithe following are the currently avialable options, more will be false null.host 70
icoming in the near future (including color theme options) false null.host 70
i false null.host 70
ionce a user sets an option or adds a bookmark a config file will be false null.host 70
icreated in their home directory. the file will be named '.bombadillo.ini' false null.host 70
iwhile it can be edited directly, it is recommended to use bombadillo false null.host 70
ito interact with said file.
i false null.host 70
i false null.host 70
i option value type default false null.host 70
i--------------- ------------------------- ------------------------ false null.host 70
i false null.host 70
ihomeurl valid gopher url this document false null.host 70
isavelocation an non-relative filepath /[home path]/Downloads/ false null.host 70
isearchengine a type 7 gopher url gopher.floodgap.com:70/7/v2/vs false null.host 70
iopenhttp true/false false false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
i false null.host 70
ifor more information please contact the following: false null.host 70
1colorfield space / colorfield.space 70
isloum@sdf.org false null.host 70
htildegit url:http://tildergit.org/sloum colorfield.space 70
i false null.host 70
i false null.host 70
i false null.host 70

View File

@ -12,7 +12,7 @@ var defaultOptions = map[string]string{
// Edit these values before compile to have different default values
// ... though they can always be edited from within bombadillo as well
// it just may take more time/work.
"homeurl": "gopher://colorfield.space:70/1/bombadillo-info",
"homeurl": "gopher://bombadillo.colorfield.space:70/1/user-guide.map",
"savelocation": userinfo.HomeDir,
"searchengine": "gopher://gopher.floodgap.com:70/7/v2/vs",
"openhttp": "false",

View File

@ -1,60 +0,0 @@
TODO
- Add styles/color support
- Add code comments/documentation for all items
- Make sure html links using the URL convention work correctly
Control keys/input:
q quit
j scrolldown
k scrollup
f toggle showing favorites as subwindow
TODO - r refresh current page data (re-request)
GO
:# go to link num
:url go to url
SIMPLE
:quit quit
:home visit home
:bookmarks toogle bookmarks window
:search
:help
DOLINK
:delete # delete bookmark with num
:bookmarks # visit bookmark with num
DOLINKAS
:write # name write linknum to file
:add # name add link num as favorite
DOAS
:write url name write url to file
:add url name add link url as favorite
:set something something set a system variable
value, action, word
- - - - - - - - - - - - - - - - - -
Config format:
[favorites]
colorfield.space ++ gopher://colorfield.space:70/
My phlog ++ gopher://circumlunar.space/1/~sloum/
[options]
home ++ gopher://sdf.org
searchengine ++ gopher://floodgap.place/v2/veronicasomething
savelocation ++ ~/Downloads/
httpbrowser ++ lynx
openhttp ++ true