From 906fc72311817f9aa3be6abd80108cc03043b22d Mon Sep 17 00:00:00 2001 From: Anton Date: Fri, 19 Apr 2024 17:17:53 +0200 Subject: [PATCH] Remove default config file Since 925944c, default config values are set within the script itself when no setting key match is found in the config file. This makes the necessity for this default config file obsolete. --- BSDmakefile | 6 ------ GNUmakefile | 6 ------ config/bashpass.conf | 3 --- 3 files changed, 15 deletions(-) delete mode 100644 config/bashpass.conf diff --git a/BSDmakefile b/BSDmakefile index 0fa113b..ed64fa4 100644 --- a/BSDmakefile +++ b/BSDmakefile @@ -1,6 +1,4 @@ PREFIX = $(HOME)/.local -CONF_DIR = $(HOME)/.config/bashpass -PASS_DIR = $(PREFIX)/share/bashpass BIN = /usr/bin MAN_DIR = /usr/share/man/man1 SUDO := doas @@ -15,9 +13,6 @@ install: @$(SUDO) install -v -m755 bashpass $(BIN) @$(SUDO) install -v -m644 docs/bashpass.1.gz $(MAN_DIR) @$(SUDO) install -v -m644 docs/bashpass.conf.1.gz $(MAN_DIR) - @mkdir -vp $(CONF_DIR) - @cp -vr config/bashpass.conf $(CONF_DIR)/bashpass.conf - @mkdir -vp $(PASS_DIR) @echo BashPass installed successfully! update: @@ -32,6 +27,5 @@ uninstall: @$(SUDO) rm -vf $(BIN)/bashpass @$(SUDO) rm -vf $(MAN_DIR)/bashpass.1.gz @$(SUDO) rm -vf $(MAN_DIR)/bashpass.conf.1.gz - @rm -vrf $(CONF_DIR) @echo BashPass uninstalled successfully! @echo Bye, have a nice day! diff --git a/GNUmakefile b/GNUmakefile index 24bfe35..ec1b190 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,6 +1,4 @@ PREFIX = $(HOME)/.local -CONF_DIR = $(HOME)/.config/bashpass -PASS_DIR = $(PREFIX)/share/bashpass BIN = /usr/bin MAN_DIR = /usr/share/man/man1 SUDO := sudo @@ -28,9 +26,6 @@ install: @$(SUDO) install -v -m755 bashpass $(BIN) @$(SUDO) install -v -m644 docs/bashpass.1.gz $(MAN_DIR) @$(SUDO) install -v -m644 docs/bashpass.conf.1.gz $(MAN_DIR) - @mkdir -vp $(CONF_DIR) - @cp -vr config/bashpass.conf $(CONF_DIR)/bashpass.conf - @mkdir -vp $(PASS_DIR) @echo BashPass installed successfully! update: @@ -45,6 +40,5 @@ uninstall: @$(SUDO) rm -vf $(BIN)/bashpass @$(SUDO) rm -vf $(MAN_DIR)/bashpass.1.gz @$(SUDO) rm -vf $(MAN_DIR)/bashpass.conf.1.gz - @rm -vrf $(CONF_DIR) @echo BashPass uninstalled successfully! @echo Bye, have a nice day! diff --git a/config/bashpass.conf b/config/bashpass.conf deleted file mode 100644 index db94392..0000000 --- a/config/bashpass.conf +++ /dev/null @@ -1,3 +0,0 @@ -location: .local/share/bashpass -timer: 10 -length: 14