cleanup main

s3

@@ -75,15 +75,17 @@ UPX="not_set";
 OPENBOX=0;UFS916003=0;_verbose="";
 _t1e="VG9vbGNoYWluLQ==";
 _u1e="aHR0cDovL3N0cmVhbWJvYXJkLnR2L3diYjIvdHV0LXBpY3MvdG9vbGNoYWlucw==";
-cposx=0;cposy=0;off="_off";on="_on";pf="empty";file_exist="0";run="0";
+cposx=0; cposy=0; off="_off"; on="_on"; pf="empty"; file_exist="0"; run="0";
 s3cfg="$configdir/simplebuild.config";loadprofile="no";menucall="no";
+
 # Compiler settings
 cc_warn="-W -Wall -Wshadow -Wredundant-decls -Wstrict-prototypes -Wold-style-definition";
 cc_opts="-ggdb -pipe -ffunction-sections -fdata-sections";
 
 #default url
-trunkurl="http://www.streamboard.tv/svn/oscam/trunk";[ -f "$workdir/oscamsource.url" ] && source "$workdir/oscamsource.url";
+trunkurl="http://www.streamboard.tv/svn/oscam/trunk";
-#trunkurl="http://www.streamboard.tv/svn/oscam-addons/modern";[ -f "$workdir/oscamsource.url" ] && source "$workdir/oscamsource.url";
+#trunkurl="http://www.streamboard.tv/svn/oscam-addons/modern";
+[ -f "$workdir/oscamsource.url" ] && source "$workdir/oscamsource.url";
 
 #load translationlist
 cd "$tdir";langsupport=(*);
@@ -125,31 +127,23 @@ else
 	for e in "${s3opts[@]}";do
 		if [ "$e" == "$1" ];then
 			case $e in
-			fix_me|\
+			fix_me|checkout|update_me|update_emu|svnrestore|enable_emu|upload_cam)
-			checkout|\
+				if [ ! -n "$2" ];then
-			update_me|\
-			update_emu|\
-			svnrestore|\
-			enable_emu|\
-			upload_cam)	if [ ! -n "$2" ];then
 					eval "$e";
 				else
 					eval "$e" "$2";
-						fi;
+				fi;exit;;
-						exit;;
+			menu)
-			menu)		if [ ! -n "$2" ];then
+				if [ ! -n "$2" ];then
 					_dialog_checkout;
 				else
 					_dialog_checkout "$2";
 				fi;;
-			loadonly)	if [ ! -n "$2" ];then
+			loadonly)
-							_nl;
+				if [ ! -n "$2" ];then
-							clear;
+					_nl; clear; s3logo;
-							s3logo;
 					echo -e "$r_l\n  $txt_error: toolchain $txt_parameter $txt_missing\n""$w_l";
-							_help_toolchain;
+					_help_toolchain; sleep 2; exit;
-							sleep 2;
-							exit;
 				else
 					for t in "${AVAI_TCLIST[@]}";do
 						_tmp="$2";
@@ -158,73 +152,54 @@ else
 					if [ -f "$tc_dl" ];then
 						echo -e "$p_l\n\n  toolchain for $_tmp loaded\n";
 					else
-								_nl;
+						_nl; clear; s3logo;
-								clear;
-								s3logo;
 						echo -e "$r_l  toolchain missing/error\n";
-							fi;
+					fi; exit;
-							exit;
 				fi;;
-			tccheck)	if [ ! -n "$2" ];then
+			tccheck)
-							_nl;
+				if [ ! -n "$2" ];then
-							clear;
+					_nl; clear; s3logo;
-							s3logo;
 					echo -e "$r_l\n  $txt_error: toolchain $txt_parameter $txt_missing\n""$w_l";
-							_help_toolchain;echo -e "$W";
+					_help_toolchain;echo -e "$W"; sleep 2; exit;
-							sleep 2;
-							exit;
 				else
 					for t in "${AVAI_TCLIST[@]}";do
 						[ "$t" == "$2" ] && _toolchain_check "$2" && break;
 					done;
-							_nl;
+					_nl; clear; s3logo;
-							clear;
-							s3logo;
 					echo -e "$r_l\n  toolchain missing/error\n$w_l";
-							_help_toolchain;echo -e "$W";
+					_help_toolchain;echo -e "$W"; sleep 2; exit;
-							sleep 2;
-							exit;
 				fi;;
-			tcrepair)	if [ ! -n "$2" ];then
+			tcrepair)
-							_nl;
+				if [ ! -n "$2" ];then
-							clear;
+					_nl; clear; s3logo;
-							s3logo;
 					echo -e "$r_l\n  $txt_error: toolchain $txt_parameter $txt_missing\n""$w_l";
-							_help_toolchain;echo -e "$W";
+					_help_toolchain;echo -e "$W"; sleep 2; exit;
-							sleep 2;
-							exit;
 				else
 					_nl;clear;_toolchain_repair "$2";sleep 2;exit;
 				fi;;
-			upload)		if [ ! -n "$2" ];then
+			upload)
-							_nl;
+				if [ ! -n "$2" ];then
-							clear;
+					_nl; clear; s3logo;
-							s3logo;
 					echo -e "$r_l\n  $txt_error: $txt_parameter $txt_missing""$w_l";
-							menucall="yes";
+					menucall="yes"; ssh_profiles;
-							ssh_profiles;
 				else
 					upload_cam "$2";
-						fi;
+				fi; exit;;
-						exit;;
 			syscheck)
-						syscheck silent $2;
+				syscheck silent $2; exit;;
-						exit;;
+			tedit)
-			tedit)		if [ -n "$2" ];then
+				if [ -n "$2" ];then
 					for telement in ${INST_TCLIST[@]};do
 						if [ "$telement" == "$2" ];then
-									tedit $2;
+							tedit $2; exit;
-									exit;
 						fi;
 					done;
-							clear;
+					clear; s3logo; echo -e $w_l"\n  $2 toolchain not installed\n"$W;
-							s3logo;
+				fi; exit;;
-							echo -e $w_l"\n  $2 toolchain not installed\n"$W;
+			help)
-						fi;
+				_help; exit;;
-						exit;;
+			*)
-			help)		_help;
+				shift && eval "$e" "$@"; #Remove the first command line argument and pass the remaining ones to the plugin
-						exit;;
-			*)			shift && eval "$e" "$@"; #Remove the first command line argument and pass the remaining ones to the plugin
 				exit;;
 			esac;
 		fi;