aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile12
-rw-r--r--README.md30
-rw-r--r--src/c_utils.go1
-rw-r--r--src/i_ui.go1
4 files changed, 35 insertions, 9 deletions
diff --git a/Makefile b/Makefile
index 013faba..276836f 100644
--- a/Makefile
+++ b/Makefile
@@ -21,7 +21,7 @@ SHELL := /bin/sh
SRC_DIR := ./src/
SRC_NAME := *.go
SRC = $(addprefix ${SRC_DIR}, ${SRC_NAME})
-DEST := /usr/local/bin
+DEST := /usr
.DEFAULT_GOAL := ${TARGET}
run: ${SRC}
@@ -30,12 +30,12 @@ run: ${SRC}
${TARGET}: ${SRC}
go build -o ${TARGET} ${SRC_DIR}
-install: ${TARGET}
- mkdir -p ${DEST}
- cp -f ${TARGET} ${DEST}
+install:
+ mkdir -p ${DEST}/bin
+ cp -f ${TARGET} ${DEST}/bin
# man shit
- # mkdir -p $(DESTDIR)$(MANPREFIX)/man1
- # cp -f man/lowbat.1 $(DESTDIR)$(MANPREFIX)/man1/lowbat.1
+ # mkdir -p $(DESTDIR)/share/man/man1
+ # cp -f man/lowbat.1 $(DESTDIR)/share/man/man1/lowbat.1
clean:
go clean
diff --git a/README.md b/README.md
index 2ad2d87..5643b19 100644
--- a/README.md
+++ b/README.md
@@ -1,14 +1,38 @@
# hardflip
-The best TUI tool to connect to your distant hosts.
+The best TUI tool to connect to your distant hosts. For Linux/BSD. Might work
+on macOS.
## Dependencies
-Install those if you need them :
+Install those if you need them:
+ `sshpass` if you are using passwords with SSH (honnestly use keys instead)
+ `xfreerdp` for RDP. Called `freerdp2-x11` on some distros
+ `openstack` for OpenStack CLI.
+ `gpg` to crypt passwords. You can store them in plain text if you prefer but
-i wouldn't recommend that option.
+I wouldn't recommend that option.
+ `go`
++ GNU `make`
+
+## Install
+
+To install `hardflip`, run those commands in your shell:
+
+```sh
+git clone git://gitjoe.xyz/jozan/hardflip
+cd hardflip
+make
+sudo make install
+make clean
+```
+
+Change this line:
+
+```make
+DEST := /usr
+```
+
+if you want to install stuff some other place
+
+## Config
diff --git a/src/c_utils.go b/src/c_utils.go
index 8d95a77..d95ac5a 100644
--- a/src/c_utils.go
+++ b/src/c_utils.go
@@ -86,6 +86,7 @@ func c_get_conf_dir(load_err *[]error) string {
if err := os.MkdirAll(ptr, os.ModePerm); err != nil {
*load_err = append(*load_err, err)
}
+ return ptr
} else if err != nil {
*load_err = append(*load_err, err)
return ""
diff --git a/src/i_ui.go b/src/i_ui.go
index 21df155..776988d 100644
--- a/src/i_ui.go
+++ b/src/i_ui.go
@@ -784,6 +784,7 @@ func i_ui(data_dir string) {
opts = DEFAULT_OPTS
} else {
opts = c_get_options(conf_dir, &load_err)
+ // FIX: options not written correctly on welcome mode + void
}
styles := c_get_styles(conf_dir, &load_err)
i_init_styles(&ui, styles)