From 089e7c8c84c9368f15aa2e7a055eb8ecbb9f8053 Mon Sep 17 00:00:00 2001
From: Gorgone <gorgone@users.noreply.github.com>
Date: Wed, 2 Sep 2020 12:45:38 +0200
Subject: [PATCH] Add files via upload

add other software cross building support
---
 s3 | 35 ++++++++++++++++++++++++++---------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/s3 b/s3
index 82d59ee..4a3df69 100755
--- a/s3
+++ b/s3
@@ -18,6 +18,7 @@ configdir="$sdir/configs"
      pdir="$sdir/patches"
   profdir="$sdir/profiles"
      bdir="$sdir/binaries"
+    sodir="$sdir/software"
     dldir="$sdir/downloads"
      fdir="$sdir/functions"
   menudir="$sdir/menu_save"
@@ -29,7 +30,7 @@ configdir="$sdir/configs"
 
 # create folders
 mkdir -p "$tcdir/native/bin" 2>/dev/null
-mkdir -p support/{archive,binaries,downloads,logs,patches,backup_svn,menu_save,upx} 2>/dev/null
+mkdir -p support/{archive,binaries,downloads,software,logs,patches,backup_svn,menu_save,upx} 2>/dev/null
 
 # create links
 [ ! -d "$ldir" ] && clear && echo -e "\n folder creation error\n\n" && exit
@@ -37,12 +38,13 @@ mkdir -p support/{archive,binaries,downloads,logs,patches,backup_svn,menu_save,u
 [ -L "$workdir/archive" ]  || ln -sf "$adir" "$workdir/archive"  2>/dev/null
 [ -L "$workdir/patches" ]  || ln -sf "$pdir" "$workdir/patches"  2>/dev/null
 [ -L "$workdir/binaries" ] || ln -sf "$bdir" "$workdir/binaries" 2>/dev/null
+[ -L "$workdir/software" ] || ln -sf "$sodir" "$workdir/software" 2>/dev/null
 [ -L "$workdir/profiles" ] || ln -sf "$profdir" "$workdir/profiles" 2>/dev/null
 
 #set arrays
 array_names_a=( SHORT_PROTOCOLS SHORT_READERS SHORT_CARD_READERS AVAI_TCLIST
-				MISS_TCLIST SHORT_ADDONS DISABLED_MODULES SHORT_MODULENAMES
-				ALL_MODULES_LONG  ENABLED_MODULES INST_TCLIST SSH_CONF_CONTENT )
+		MISS_TCLIST SHORT_ADDONS DISABLED_MODULES SHORT_MODULENAMES
+		ALL_MODULES_LONG  ENABLED_MODULES INST_TCLIST SSH_CONF_CONTENT )
 array_names_A=( INTERNAL_MODULES USE_vars USE_vars_disable s3cfg_vars )
 
 for a_n in "${array_names_a[@]}"
@@ -77,8 +79,8 @@ s3cfg_vars[delete_oscamdebugbinary]=1
 #filled arrays
 config_cases=( all addons protocols readers card_readers );
 s3opts=( cedit checkout clean enable_emu fix_me get_patch help lang_select loadonly\
-		 menu profiles ssh_profiles svnpatch svnrestore svnup syscheck sysinfo tccheck\
-		 tcrepair tedit update update_emu update_me upload ) # extendable with plugins
+	menu profiles ssh_profiles svnpatch svnrestore svnup syscheck sysinfo tccheck\
+	tcrepair tedit update update_emu update_me upload ) # extendable with plugins
 
 CUSTOM_CONFDIR="not_set"
 pf_name="not_set"
@@ -131,6 +133,21 @@ else
 	echo "fail functions"
 fi
 
+#software build support
+if [ -d "$sodir" ]
+then
+	cd "$sodir"
+	x=(*)
+	for i in "${x[@]}"
+	do
+	    if [ -f "$i" ]; then
+		source "$i"
+		plugin=$(awk '/^#simplebuild_plugin/ {printf $2}' $i)
+		[ -z "$plugin" ] || s3opts+=($plugin)
+	    fi
+	done
+fi
+
 #initialize simplebuild
 initializeANSI	# load colors
 auto_langset	# echo "info $txt_load_ok";
@@ -143,10 +160,10 @@ syscheck
 _create_native_profile	# put native datas to toolchains and configs
 _get_config_con "$1"	# echo $addons;exit;
 _create_module_arrays	# fill module arrays
-_fill_tc_array			# get # AVAI_TCLIST # INST_TCLIST # MISS_TCLIST
-read_s3cfg				# read simplebuild config
-_set_dialog_types		# fill $gui vars
-_systype				# check used uname
+_fill_tc_array		# get # AVAI_TCLIST # INST_TCLIST # MISS_TCLIST
+read_s3cfg		# read simplebuild config
+_set_dialog_types	# fill $gui vars
+_systype		# check used uname
 
 if [ -z "$1" ]
 then