Use '_' instead of '\ ' to connect values in language and expiration arrays. Substitute '_' with ' ' when using the arrays.

1 files changed, 22 insertions, 24 deletions

diff --git a/wgetpaste b/wgetpaste
index cd362f3..f3b83f5 100755
--- a/wgetpaste
+++ b/wgetpaste
@@ -121,21 +121,19 @@ verify_service() {
 ### languages
 
 # rafb
-rafb_LANGUAGES=(C C89 C99 C++ C\# Java Pascal Perl PHP PL\/I Python Ruby SQL VB Plain\ Text)
+rafb_LANGUAGES=(C C89 C99 C++ C\# Java Pascal Perl PHP PL\/I Python Ruby SQL VB Plain_Text)
 # ca - ordering is important here as their value is set as their number in the order
-ca_LANGUAGES=(Plain\ Text Asterisk\ Configuration C C++ PHP Perl Java VB C\# Ruby \
-Python Pascal mIRC PL/I XML SQL Scheme ActionScript Ada 	\
-Apache\ Configuration Assembly\ \(NASM\) ASP Bash CSS Delphi HTML\ 6\.0\ Strict JavaScript \
-LISP Lua Microprocessor\ ASM Objective\ C VB\.NET)
+ca_LANGUAGES=(Plain_Text Asterisk_Configuration C C++ PHP Perl Java VB C\# Ruby Python Pascal \
+mIRC PL/I XML SQL Scheme ActionScript Ada Apache_Configuration Assembly_\(NASM\) ASP Bash CSS \
+Delphi HTML_6\.0_Strict JavaScript LISP Lua Microprocessor_ASM Objective_C VB\.NET)
 # stgraber - ordering for languages and values must be the same
-stgraber_LANGUAGES=(Plain\ Text ActionScript Ada Apache\ Log\ File AppleScript \
-Assembly\ \(NASM\) ASP Bash C C\ for\ Macs CAD\ DCL CAD\ Lisp C++ C\# ColdFusion CSS D Delphi \
-Diff DOS Eiffel Fortran FreeBasic Game\ Maker HTML INI\ file Java Javascript Lisp Lua MatLab \
-Microprocessor\ ASM MySQL NullSoft\ Installer Objective\ C OCaml Openoffice\.org\ BASIC \
-Oracle\ 8 Pascal Perl PHP Python QBasic\/QuickBASIC Robots Ruby Scheme Smarty SQL TCL VB \
-VB\.NET VisualFoxPro XML)
-stgraber_LANGUAGE_VALUES=(text actionscript ada apache applescript asm asp bash c c\_mac caddcl cadlisp \
-cpp csharp cfm css d delphi diff dos eiffel fortran freebasic gml html4strict ini java \
+stgraber_LANGUAGES=(Plain_Text ActionScript Ada Apache_Log_File AppleScript Assembly_\(NASM\) \
+ASP Bash C C_for_Macs CAD_DCL CAD_Lisp C++ C\# ColdFusion CSS D Delphi Diff DOS Eiffel Fortran \
+FreeBasic Game_Maker HTML INI_file Java Javascript Lisp Lua MatLab Microprocessor_ASM MySQL \
+NullSoft_Installer Objective_C OCaml Openoffice\.org_BASIC Oracle_8 Pascal Perl PHP Python \
+QBasic\/QuickBASIC Robots Ruby Scheme Smarty SQL TCL VB VB\.NET VisualFoxPro XML)
+stgraber_LANGUAGE_VALUES=(text actionscript ada apache applescript asm asp bash c c\_mac caddcl \
+cadlisp cpp csharp cfm css d delphi diff dos eiffel fortran freebasic gml html4strict ini java \
 javascript lisp lua matlab mpasm mysql nsis objc ocaml oobas oracle8 pascal perl php python \
 qbasic robots ruby scheme smarty sql tcl vb vbnet visualfoxpro xml)
 
@@ -144,7 +142,7 @@ show_languages() {
 	case "${SERVICE}" in
 		ca | rafb | stgraber )
 		for language in $(eval "echo \${${SERVICE}_LANGUAGES[*]}"); do
-			echo "    ${language}"
+			echo "    ${language//_/ }"
 		done | sort
 		;;
 		* )
@@ -160,18 +158,18 @@ verify_language() {
 		let "i = 0"
 		for language in ${ca_LANGUAGES[*]}; do
 			let "i = i +1"
-			[[ "${LANGUAGE}" == "${language}" ]] && LANGUAGE="${i}" && return 0
+			[[ "${LANGUAGE}" == "${language//_/ }" ]] && LANGUAGE="${i}" && return 0
 		done
 		;;
 		rafb )
 		for language in ${rafb_LANGUAGES[*]}; do
-			[[ "${LANGUAGE}" == "${language}" ]] && return 0
+			[[ "${LANGUAGE}" == "${language//_/ }" ]] && return 0
 		done
 		;;
 		stgraber )
 		let "i = 0"
 		for language in ${stgraber_LANGUAGES[*]}; do
-			[[ "${LANGUAGE}" == "${language}" ]] && LANGUAGE="${stgraber_LANGUAGE_VALUES[i]}" && return 0
+			[[ "${LANGUAGE}" == "${language//_/ }" ]] && LANGUAGE="${stgraber_LANGUAGE_VALUES[i]}" && return 0
 			let "i = i + 1"
 		done
 		;;
@@ -185,11 +183,11 @@ verify_language() {
 ### expiration
 
 # ca
-ca_EXPIRATION_OPTIONS=(Never 5\ minutes 10\ minutes 15\ minutes 30\ minutes 45\ minutes 1\ hour \
-2\ hours 4\ hours 8\ hours 12\ hours 1\ day 2\ days 3\ days 1\ week 2\ weeks 3\ weeks 1\ month \
-2\ months 3\ months 4\ months 5\ months 6\ months 1\ year)
+ca_EXPIRATION_OPTIONS=(Never 5_minutes 10_minutes 15_minutes 30_minutes 45_minutes 1_hour 2_hours \
+4_hours 8_hours 12_hours 1_day 2_days 3_days 1_week 2_weeks 3_weeks 1_month 2_months 3_months \
+4_months 5_months 6_months 1_year)
 # stgraber - ordering for options and values must be the same
-stgraber_EXPIRATION_OPTIONS=(Never 1\ day 1\ month)
+stgraber_EXPIRATION_OPTIONS=(Never 1_day 1_month)
 stgraber_EXPIRATION_VALUES=(f d m)
 
 show_expiration_options() {
@@ -197,7 +195,7 @@ show_expiration_options() {
 	case "${SERVICE}" in
 		ca | stgraber )
 		for expiration in $(eval "echo \${${SERVICE}_EXPIRATION_OPTIONS[*]}"); do
-			echo "    ${expiration}"
+			echo "    ${expiration//_/ }"
 		done
 		;;
 		rafb )
@@ -216,13 +214,13 @@ verify_expiration_options() {
 	case "${SERVICE}" in
 		ca )
 		for expiration in ${ca_EXPIRATION_OPTIONS[*]}; do
-			[[ "${EXPIRATION}" == "${expiration}" ]] && return 0
+			[[ "${EXPIRATION}" == "${expiration//_/ }" ]] && return 0
 		done
 		;;
 		stgraber )
 		let "i = 0"
 		for expiration in ${stgraber_EXPIRATION_OPTIONS[*]}; do
-			[[ "${EXPIRATION}" == "${expiration}" ]] && EXPIRATION="${stgraber_EXPIRATION_VALUES[i]}" && return 0
+			[[ "${EXPIRATION}" == "${expiration//_/ }" ]] && EXPIRATION="${stgraber_EXPIRATION_VALUES[i]}" && return 0
 			let "i = i + 1"
 		done
 		;;