telekom-security/tpotce
1
0
Fork 0
mirror of https://github.com/telekom-security/tpotce.git synced 2025-07-02 01:27:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

tweaking

Browse Source
This commit is contained in:
t3chn0m4g3
2019-02-19 09:14:13 +01:00
parent bb1cc6bd04
commit 39ac35935b
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
iso/installer/install.sh
View File

@ -92,7 +92,7 @@ myNETWORK_WLANEXAMPLE="
### Example wireless config without 802.1x ### Example wireless config without 802.1x
### This configuration was tested with the IntelNUC series ### This configuration was tested with the IntelNUC series
### If problems occur you can try and change wpa-driver to "iwlwifi" ### If problems occur you can try and change wpa-driver to \"iwlwifi\"
# #
#auto wlan0 #auto wlan0
#iface wlan0 inet dhcp #iface wlan0 inet dhcp
@ -211,24 +211,19 @@ function fuCHECKPACKAGES {
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
echo -n "### Checking for installer dependencies: " echo -n "### Checking for installer dependencies: "
local myPACKAGES="$1" local myPACKAGES="$1"
local myINST=""
for myDEPS in $myPACKAGES; for myDEPS in $myPACKAGES;
do do
myOK=$(dpkg -s $myDEPS | grep ok | awk '{ print $3 }' | head -n 1); myOK=$(dpkg -s $myDEPS 2>&1 | grep -w ok | awk '{ print $3 }' | head -n 1)
if [ "$myOK" != "ok" ] if [ "$myOK" != "ok" ];
then
myINST=$(echo $myINST $myDEPS)
fi
done
if [ "$myINST" != "" ]
then then
echo "[ NOW INSTALLING ]" echo "[ NOW INSTALLING ]"
apt-get update -y apt-get update -y
for myDEPS in $myINST; apt-get install -y $myPACKAGES
do break
apt-get install $myDEPS -y fi
done done
else if [ "$myOK" = "ok" ];
then
echo "[ OK ]" echo "[ OK ]"
fi fi
} }
@ -592,10 +587,10 @@ dialog --clear
exec 2> >(tee "/install.err") exec 2> >(tee "/install.err")
exec > >(tee "/install.log") exec > >(tee "/install.log")
fuGET_DEPS
fuBANNER "Installing ..." fuBANNER "Installing ..."
fuGET_DEPS
# If flavor is SENSOR do not write credentials # If flavor is SENSOR do not write credentials
if ! [ "$myCONF_TPOT_FLAVOR" == "SENSOR" ]; if ! [ "$myCONF_TPOT_FLAVOR" == "SENSOR" ];
then then