Standardize on "generate config" over "generate rc" verbage.

Support for `~/.tmux-powerlinerc` was removed in [this commit](ebd2823), so it might be best to standardize on verbage around generation of `config.sh` file. Chose not to update naming for segment functions (i.e. `generate_segmentrc()`).

Author: izzygomez

README.md

@@ -143,12 +143,12 @@ Adapt the commands below if your paths differs from this.
 ## Config file
 Start by generating your own configuration file:
 ```shell
-~/.config/tmux/plugins/tmux-powerline/generate_rc.sh
+~/.config/tmux/plugins/tmux-powerline/generate_config.sh
 mv ~/.config/tmux-powerline/config.sh.default ~/.config/tmux-powerline/config.sh
 $EDITOR ~/.config/tmux-powerline/config.sh
 ```
 
-Go through the default config and adjust to you needs!
+Go through the default config and adjust to your needs!
 
 ## Custom theme
 The theme is specified by setting the environment variable `$TMUX_POWERLINE_THEME` in the config file above. It will use a default theme and you probably want to use your own. The default config have set the custom theme path to be `~/.config/tmux-powerline/themes/`.
@@ -237,7 +237,7 @@ This project can only gain positively from contributions. Fork today and make yo
 ## How to make a segment
 If you want to (of course you do!) send a pull request for a cool segment you written make sure that it follows the style of existing segments, unless you have good reason for it. Each segment resides in the `segments/` directory with a descriptive and simple name. A segment must have at least one function and that is `run_segment` which is like the main function that is called from the tmux-powerline lib. What ever text is echoed out from this function to stdout is the text displayed in the tmux status bar. If the segment at a certain point does not have anything to show, simply don't echo anything out and the segment will be hidden. A successful execution of the `run_segment` function should return an exit code of 0. If the segment failed to execute in a fatal way return a non-zero exit code so the user can pick up the error and fix it when debug mode is on (e.g. missing program that is needed for the segment).
 
-Usage of helper function to organize the work of a segment is encourage and should be named in the format `__helper_func`. If a segment has settings it should have a function `generate_rc` which outputs default values of all settings and a short explanation of the setting and its values. Study e.g. `segments/now_playing.sh` to see how it is done. A segment having settings should typically call a helper function `__process_settings` as the first statement in `run_segment` that sets default values to the settings that has not been set by the user.
+Usage of helper function to organize the work of a segment is encourage and should be named in the format `__helper_func`. If a segment has settings it should have a function `generate_segmentrc` which outputs default values of all settings and a short explanation of the setting and its values. Study e.g. `segments/now_playing.sh` to see how it is done. A segment having settings should typically call a helper function `__process_settings` as the first statement in `run_segment` that sets default values to the settings that has not been set by the user.
 
 Also, don't use bash4 features as requiring bash4 complicates installation for macOS user quite a bit. Use tabs for indentation ([discussion](https://github.com/erikw/tmux-powerline/pull/92)),
 

config/paths.sh

@@ -4,15 +4,15 @@ export TMUX_POWERLINE_DIR_LIB="$TMUX_POWERLINE_DIR_HOME/lib"
 export TMUX_POWERLINE_DIR_SEGMENTS="$TMUX_POWERLINE_DIR_HOME/segments"
 export TMUX_POWERLINE_DIR_TEMPORARY="/tmp/tmux-powerline_${USER}"
 export TMUX_POWERLINE_DIR_THEMES="$TMUX_POWERLINE_DIR_HOME/themes"
-if [ -z "$TMUX_POWERLINE_RCFILE" ]; then
-	export TMUX_POWERLINE_RCFILE="${XDG_CONFIG_HOME:-$HOME/.config}/tmux-powerline/config.sh"
+if [ -z "$TMUX_POWERLINE_CONFIG_FILE" ]; then
+	export TMUX_POWERLINE_CONFIG_FILE="${XDG_CONFIG_HOME:-$HOME/.config}/tmux-powerline/config.sh"
 fi
-export TMUX_POWERLINE_RCFILE_DEFAULT="${TMUX_POWERLINE_RCFILE}.default"
+export TMUX_POWERLINE_CONFIG_FILE_DEFAULT="${TMUX_POWERLINE_CONFIG_FILE}.default"
 
-export TMUX_POWERLINE_RCDIR="$(dirname $TMUX_POWERLINE_RCFILE)"
+export TMUX_POWERLINE_CONFIG_DIR="$(dirname $TMUX_POWERLINE_CONFIG_FILE)"
 
-if [ ! -d "$TMUX_POWERLINE_RCDIR" ] && [ ! -L "$TMUX_POWERLINE_RCDIR" ]; then
-  mkdir -p "$TMUX_POWERLINE_RCDIR"
+if [ ! -d "$TMUX_POWERLINE_CONFIG_DIR" ] && [ ! -L "$TMUX_POWERLINE_CONFIG_DIR" ]; then
+	mkdir -p "$TMUX_POWERLINE_CONFIG_DIR"
 fi
 
 if [ ! -d "$TMUX_POWERLINE_DIR_TEMPORARY" ]; then

generate_rc.sh renamed to generate_config.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
-# Generate default rc file.
+# Generate default config file.
 
 export TMUX_POWERLINE_DIR_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 source "${TMUX_POWERLINE_DIR_HOME}/config/paths.sh"
 source "${TMUX_POWERLINE_DIR_HOME}/config/defaults.sh"
 source "${TMUX_POWERLINE_DIR_HOME}/config/shell.sh"
-source "${TMUX_POWERLINE_DIR_LIB}/rcfile.sh"
+source "${TMUX_POWERLINE_DIR_LIB}/config_file.sh"
 
-generate_default_rc
+generate_default_config
 
 exit 0

lib/rcfile.sh renamed to lib/config_file.sh

@@ -1,7 +1,7 @@
-# Read user rc file.
+# Read user config file.
 
 process_settings() {
-	__read_rcfile
+	__read_config_file
 
 	if [ -z "$TMUX_POWERLINE_DEBUG_MODE_ENABLED" ]; then
 		export TMUX_POWERLINE_DEBUG_MODE_ENABLED="${TMUX_POWERLINE_DEBUG_MODE_ENABLED_DEFAULT}"
@@ -53,8 +53,8 @@ process_settings() {
 
 }
 
-generate_default_rc() {
-	read -d '' rccontents  << EORC
+generate_default_config() {
+	read -d '' config_contents  << EORC
 # Default configuration file for tmux-powerline.
 # Modeline {
 #	 vi: foldmarker={,} foldmethod=marker foldlevel=0 tabstop=4 filetype=sh
@@ -100,17 +100,17 @@ EORC
 			segmentrc=$(generate_segmentrc | sed -e 's/^/\\t/g')
 			unset -f generate_segmentrc
 			local seg_name="${segment##*/}"
-			rccontents="${rccontents}\n\n# ${seg_name} {\n${segmentrc}\n# }"
+			config_contents="${config_contents}\n\n# ${seg_name} {\n${segmentrc}\n# }"
 		fi
 	done
 
-	echo -e "$rccontents" > "$TMUX_POWERLINE_RCFILE_DEFAULT"
-	echo "Default configuration file generated to: ${TMUX_POWERLINE_RCFILE_DEFAULT}"
-	echo "Copy/move it to \"${TMUX_POWERLINE_RCFILE}\" and make your changes."
+	echo -e "$config_contents" > "$TMUX_POWERLINE_CONFIG_FILE_DEFAULT"
+	echo "Default configuration file generated to: ${TMUX_POWERLINE_CONFIG_FILE_DEFAULT}"
+	echo "Copy/move it to \"${TMUX_POWERLINE_CONFIG_FILE}\" and make your changes."
 }
 
-__read_rcfile() {
-	if [  -f "$TMUX_POWERLINE_RCFILE" ]; then
-		source "$TMUX_POWERLINE_RCFILE"
+__read_config_file() {
+	if [  -f "$TMUX_POWERLINE_CONFIG_FILE" ]; then
+		source "$TMUX_POWERLINE_CONFIG_FILE"
 	fi
 }

lib/headers.sh

@@ -18,4 +18,4 @@ source "${TMUX_POWERLINE_DIR_LIB}/arg_processing.sh"
 source "${TMUX_POWERLINE_DIR_LIB}/formatting.sh"
 source "${TMUX_POWERLINE_DIR_LIB}/muting.sh"
 source "${TMUX_POWERLINE_DIR_LIB}/powerline.sh"
-source "${TMUX_POWERLINE_DIR_LIB}/rcfile.sh"
+source "${TMUX_POWERLINE_DIR_LIB}/config_file.sh"