diff options
| -rw-r--r-- | Makefile | 11 | ||||
| -rw-r--r-- | src/c_init.go | 7 | ||||
| -rw-r--r-- | src/i_ui.go | 1 |
3 files changed, 12 insertions, 7 deletions
@@ -20,8 +20,10 @@ TARGET := hf SHELL := /bin/sh SRC_DIR := ./src/ SRC_NAME := *.go -SRC = $(addprefix ${SRC_DIR}, ${SRC_NAME}) +CONF_DIR := ./src/ +SRC := $(addprefix ${SRC_DIR}, ${SRC_NAME}) DEST := /usr +XDG_CONFIG_HOME ?= $(HOME)/.config .DEFAULT_GOAL := ${TARGET} run: ${SRC} @@ -31,11 +33,14 @@ ${TARGET}: ${SRC} go build -o ${TARGET} ${SRC_DIR} install: - mkdir -p ${DEST}/bin - cp -f ${TARGET} ${DEST}/bin + # mkdir -p ${DEST}/bin + # cp -f ${TARGET} ${DEST}/bin # man shit # mkdir -p $(DESTDIR)/share/man/man1 # cp -f man/lowbat.1 $(DESTDIR)/share/man/man1/lowbat.1 + # mkdir -p $(XDG_CONFIG_HOME)/hf + # cp -f $(CONF_DIR)/* $(XDG_CONFIG_HOME)/hf + # cp -f $(CONF_DIR)/config.sample.yml $(XDG_CONFIG_HOME)/config.yml clean: go clean diff --git a/src/c_init.go b/src/c_init.go index 58b71c5..130ca96 100644 --- a/src/c_init.go +++ b/src/c_init.go @@ -179,18 +179,19 @@ func c_write_styles(file string, opts HardStyle, load_err *[]error) { } func c_get_options(dir string, load_err *[]error) HardOpts { - opts := HardOpts{} + opts := DEFAULT_OPTS file := dir + "/" + CONF_FILE_NAME if _, err := os.Stat(file); os.IsNotExist(err) { c_write_options(file, DEFAULT_OPTS, load_err) - return DEFAULT_OPTS + opts.file = file + return opts } opts, err := c_parse_opts(file) opts.file = file if err != nil { *load_err = append(*load_err, err) - return DEFAULT_OPTS + return opts } return opts } diff --git a/src/i_ui.go b/src/i_ui.go index 776988d..21df155 100644 --- a/src/i_ui.go +++ b/src/i_ui.go @@ -784,7 +784,6 @@ 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) |