From 2808138791d1859a692d1902df81ad9ffb25b6d1 Mon Sep 17 00:00:00 2001 From: Manuel Palenzuela Date: Thu, 24 Oct 2019 14:48:04 +0100 Subject: Changed names of files --- config | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 config (limited to 'config') diff --git a/config b/config new file mode 100644 index 0000000..eab201c --- /dev/null +++ b/config @@ -0,0 +1,17 @@ +# What modules, in what order +MODULES="mpd weather volumebar wifi internet cpuload temperatu + +# Modules that require an active internet connection +ONLINE_MODULES="weather internet" + +# Delay between showing the status bar +DELAY="0.05" + +# Where the custom modules are stored +CUSTOM_DIR="/home/$USER/.config/dwmbar/modules/custom/" + +# Separator between modules +SEPARATOR=" | " + +# Padding at the end and beggining of the status bar +PADDING="$USER@$HOSTNAME " -- cgit v1.2.3 From 4d1c3a91f7811732af65a7a0ac7d477f2a2a497b Mon Sep 17 00:00:00 2001 From: "Archie Hilton (thytom)" Date: Thu, 24 Oct 2019 16:30:51 +0100 Subject: Fixed the config --- config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'config') diff --git a/config b/config index eab201c..ce46b0e 100644 --- a/config +++ b/config @@ -1,5 +1,5 @@ # What modules, in what order -MODULES="mpd weather volumebar wifi internet cpuload temperatu +MODULES="mpd weather volumebar wifi internet cpuload temperature" # Modules that require an active internet connection ONLINE_MODULES="weather internet" -- cgit v1.2.3 From b4fb27fd60a64c608319c97826ec2f09f5c26732 Mon Sep 17 00:00:00 2001 From: "Archie Hilton (thytom)" Date: Thu, 24 Oct 2019 16:50:31 +0100 Subject: Just use the source command, and added left padding. --- TODO.org | 1 - bar.sh | 15 +++------------ config | 9 +++++++-- 3 files changed, 10 insertions(+), 15 deletions(-) (limited to 'config') diff --git a/TODO.org b/TODO.org index 9d5d61e..0646d1d 100644 --- a/TODO.org +++ b/TODO.org @@ -17,7 +17,6 @@ Each module writes to stdout. - Have default modules in /usr/share/dwmbar and all the modules in the .config/dwmbar/modules override the default ones (no need to have a custom module dir) -- Fix modules like temp cutting out when running Bugs to fix: None diff --git a/bar.sh b/bar.sh index c56cfa1..44c4ec0 100755 --- a/bar.sh +++ b/bar.sh @@ -15,23 +15,14 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . + CONFIG_FILE="/home/$USER/.config/dwmbar/config" -DELAY=$(cat $CONFIG_FILE | grep -E "DELAY" | cut -d '"' -f2) -MODULES_DIR="/home/$USER/.config/dwmbar/modules/" -CUSTOM_DIR=$(cat $CONFIG_FILE | grep -E "CUSTOM_DIR" | cut -d '"' -f2) -SEPARATOR=$(cat $CONFIG_FILE | grep -E "SEPARATOR" | cut -d '"' -f2) -PADDING=$(cat $CONFIG_FILE | grep -E "PADDING" | cut -d '"' -f2) +source $CONFIG_FILE OUTPUT_CACHE="/home/$USER/.config/dwmbar/.cache/" OUTPUT="" -# What modules, in what order -MODULES=$(cat $CONFIG_FILE | grep -E "MODULES" | cut -d '"' -f2) - -# Modules that require an active internet connection -ONLINE_MODULES=$(cat $CONFIG_FILE | grep -E "ONLINE_MODULES" | cut -d '"' -f2) - INTERNET=1 #0 being true get_internet() @@ -55,7 +46,7 @@ get_bar() done # Uncomment to remove last separator # bar=$(echo $bar | sed 's/.$//g') - echo "$bar$PADDING" + echo "$LEFT_PADDING$bar$RIGHT_PADDING" } run_module() diff --git a/config b/config index ce46b0e..503b487 100644 --- a/config +++ b/config @@ -1,5 +1,9 @@ +#!/bin/bash + +MODULES_DIR="/home/$USER/.config/dwmbar/modules/" + # What modules, in what order -MODULES="mpd weather volumebar wifi internet cpuload temperature" +MODULES="mpd weather volumebar wifi internet cpuload temperature date time" # Modules that require an active internet connection ONLINE_MODULES="weather internet" @@ -14,4 +18,5 @@ CUSTOM_DIR="/home/$USER/.config/dwmbar/modules/custom/" SEPARATOR=" | " # Padding at the end and beggining of the status bar -PADDING="$USER@$HOSTNAME " +RIGHT_PADDING="$USER@$HOSTNAME " +LEFT_PADDING=" " -- cgit v1.2.3 From 64300140a1a59b30dabc577eea7e26ffc8f3b4a8 Mon Sep 17 00:00:00 2001 From: "Archie Hilton (thytom)" Date: Thu, 24 Oct 2019 17:27:20 +0100 Subject: Restructuring Moved bar.sh to /usr/share/dwmbar. Modules are now only in /usr/share/dwmbar. Custom modules folder is now in .config/dwmbar. This will allow for paralellised modules down the line. --- bar.sh | 7 ++++--- config | 2 -- dwmbar | 15 +++++---------- install.sh | 7 ++++++- 4 files changed, 15 insertions(+), 16 deletions(-) (limited to 'config') diff --git a/bar.sh b/bar.sh index 44c4ec0..f9866f4 100755 --- a/bar.sh +++ b/bar.sh @@ -16,13 +16,14 @@ # along with this program. If not, see . -CONFIG_FILE="/home/$USER/.config/dwmbar/config" - -source $CONFIG_FILE +MODULES_DIR="/usr/share/dwmbar/modules/" OUTPUT_CACHE="/home/$USER/.config/dwmbar/.cache/" OUTPUT="" +CONFIG_FILE="/home/$USER/.config/dwmbar/config" +source $CONFIG_FILE + INTERNET=1 #0 being true get_internet() diff --git a/config b/config index 503b487..c53aaeb 100644 --- a/config +++ b/config @@ -1,7 +1,5 @@ #!/bin/bash -MODULES_DIR="/home/$USER/.config/dwmbar/modules/" - # What modules, in what order MODULES="mpd weather volumebar wifi internet cpuload temperature date time" diff --git a/dwmbar b/dwmbar index f0514c7..2536d13 100755 --- a/dwmbar +++ b/dwmbar @@ -19,14 +19,11 @@ VERSION="0.1" DEFAULT_CONFIG_DIR="/usr/share/dwmbar" DEFAULT_MODULES_DIR="$DEFAULT_CONFIG_DIR/modules" -DEFAULT_RC_LOCATION="$DEFAULT_CONFIG_DIR/bar.sh" +DEFAULT_BAR_LOCATION="$DEFAULT_CONFIG_DIR/bar.sh" DEFAULT_CONFIG_LOCATION="$DEFAULT_CONFIG_DIR/config" -RC_LOCATION="/home/$USER/.config/dwmbar/bar.sh" CONFIG_DIR="/home/$USER/.config/dwmbar" -MODULES_DIR="$CONFIG_DIR/modules" -CUSTOM_DIR="$MODULES_DIR/custom" -DWMBARRC="$CONFIG_DIR/bar.sh" +CUSTOM_DIR="$CONFIG_DIR/custom" CONFIG_FILE="$CONFIG_DIR/config" CACHE_DIR="$CONFIG_DIR/.cache" @@ -39,9 +36,7 @@ print_help(){ copy_usr_to_home(){ [[ ! -d $CONFIG_DIR ]] && cp -r /usr/share/dwmbar $CONFIG_DIR - [[ ! -f $DWMBARRC ]] && cp /usr/share/dwmbar/bar.sh $DWMBARRC [[ ! -f $CONFIG_FILE ]] && cp /usr/share/dwmbar/config $CONFIG_FILE - [[ ! -d $MODULES_DIR ]] && cp /usr/share/dwmbar/modules $MODULES_DIR [[ ! -d $CUSTOM_DIR ]] && mkdir $CUSTOM_DIR [[ ! -d $CACHE_DIR ]] && mkdir $CACHE_DIR } @@ -57,8 +52,8 @@ check_files(){ exit 1 fi - if [[ ! -f $DEFAULT_RC_LOCATION ]]; then - echo "$DEFAULT_RC_LOCATION does not exist." > /dev/stderr + if [[ ! -f $DEFAULT_BAR_LOCATION ]]; then + echo "$DEFAULT_BAR_LOCATION does not exist." > /dev/stderr exit 1 fi @@ -80,5 +75,5 @@ done check_files while :; do - xsetroot -name "$(exec $RC_LOCATION)" + xsetroot -name "$(exec $DEFAULT_BAR_LOCATION)" done diff --git a/install.sh b/install.sh index 715c989..c409bd2 100755 --- a/install.sh +++ b/install.sh @@ -32,8 +32,13 @@ fi mkdir --parents "/usr/share/dwmbar/" +echo "./modules --> /usr/share/dwmbar/modules" cp -r "./modules" "/usr/share/dwmbar/modules" -cp -r "./bar.sh" "/usr/share/dwmbar/bar.sh" + +echo "./bar.sh --> /usr/share/dwmbar/bar.sh" +cp "./bar.sh" "/usr/share/dwmbar/bar.sh" + +echo "./config --> /usr/share/dwmbar/config" cp -r "./config" "/usr/share/dwmbar/config" echo "./dwmbar --> /usr/bin/dwmbar" -- cgit v1.2.3