Fix configuration

huijunchen9260 · Dec 6, 2020 · 145b0c4 · 145b0c4
1 parent c742db2
commit 145b0c4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/dmenufm b/dmenufm
@@ -82,6 +82,8 @@ COMPRESSIONLIST=$(printf '%s\n' "tar.gz" "tar.bz2" "tar.xz" "xz" "lzma" "gz" "bz
 nl='
 '
 
+configuration
+
 # Create files / directories
 [ ! -d "$FM_PATH" ] && mkdir -p "$FM_PATH"
 [ ! -f "$FM_PATH/dmenufm.conf" ] && cp "/etc/dmenufm.conf" "$FM_PATH/dmenufm.conf"
@@ -198,12 +200,10 @@ if [ "$(id -u)" -eq 0 ]; then
     FM_GENERIC_COLOR="$FM_SUDO_COLOR"
 
     GetOS
-    configuration
     Program
     MainMenu
 else
     GetOS
-    configuration
     Program
     MainMenu
 fi

diff --git a/dmenufm-menu b/dmenufm-menu
@@ -266,13 +266,6 @@ MainMenu () { # Usage: MainMenu
 				openin=0
 				unset FM_OPENER
 				configuration
-				# if [ -r "$FM_PATH/dmenufm.conf" ]; then
-				#     . "$FM_PATH/dmenufm.conf"
-				# elif [ -r "/etc/dmenufm.conf" ]; then
-				#     . "/etc/dmenufm.conf"
-				# else
-				#     echo 'Run `sudo make install` first to install all dmenufm files.'
-				# fi
 			    fi
 			    ;;
 		    esac