diff options
| -rwxr-xr-x | bar.sh | 10 | ||||
| -rwxr-xr-x | dwmbar | 13 |
2 files changed, 17 insertions, 6 deletions
@@ -14,19 +14,17 @@ # # You should have received a copy of the GNU General Public License # along with this program. If not, see <https://www.gnu.org/licenses/>. - -MODULES_DIR="/usr/share/dwmbar/modules/" - -if [[ -d $CACHE_DIR ]]; then +if [[ -z $CACHE_DIR ]]; then OUTPUT_CACHE="$CACHE_DIR" else OUTPUT_CACHE="/home/$USER/.config/dwmbar/.cache/" fi -OUTPUT="" CONFIG_FILE="/home/$USER/.config/dwmbar/config" source $CONFIG_FILE +OUTPUT="" + get_bar() { for module in $MODULES; do @@ -46,7 +44,7 @@ run_module() then out="$($CUSTOM_DIR$1)" else - out="$($MODULES_DIR$1)" + out="$($DEFAULT_MODULES_DIR$1)" fi if [[ ! "$out" = "" ]]; then @@ -16,13 +16,26 @@ VERSION="0.2" DEFAULT_CONFIG_DIR="/usr/share/dwmbar" +export DEFAULT_CONFIG_DIR DEFAULT_MODULES_DIR="$DEFAULT_CONFIG_DIR/modules" +export DEFAULT_MODULES_DIR DEFAULT_BAR_LOCATION="$DEFAULT_CONFIG_DIR/bar.sh" +export DEFAULT_BAR_LOCATION DEFAULT_CONFIG_LOCATION="$DEFAULT_CONFIG_DIR/config" +export DEFAULT_CONFIG_LOCATION CONFIG_DIR="/home/$USER/.config/dwmbar" +export CONFIG_DIR + CUSTOM_DIR="$CONFIG_DIR/custom" +export CUSTOM_DIR + CONFIG_FILE="$CONFIG_DIR/config" +if [[ ! -f "$CONFIG_FILE" ]]; then + CONFIG_FILE=$DEFAULT_CONFIG_LOCATION +fi +export CONFIG_FILE + CACHE_DIR="$HOME/.cache/dwmbar/" export CACHE_DIR |