m0ar fizax
This commit is contained in:
+16
-4
@@ -124,8 +124,7 @@ function returnStatus() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function writeToLog() {
|
function writeToLog() {
|
||||||
echo -e "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): $1"
|
echo -e "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): $1" | tee -a "$log"
|
||||||
echo -e "$(date '+%d/%m/%Y %H:%M:%S %Z (%s)'): $1" >> $log
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function messagePTS() {
|
function messagePTS() {
|
||||||
@@ -421,8 +420,21 @@ handleReboot() {
|
|||||||
|
|
||||||
function handleCheckEspIdf() {
|
function handleCheckEspIdf() {
|
||||||
if [ ! -z $IDF_PYTHON_ENV_PATH ]; then
|
if [ ! -z $IDF_PYTHON_ENV_PATH ]; then
|
||||||
writeToLog "FAIL: Sanity check failed!\n\tesp-idf environment varibles found!\n\tPelase run from a fresh termnal that has not had get_idf ran!\n"
|
writeToLog "esp-idf environment varibles found! Unsetting them"
|
||||||
exit
|
# unset esp-idf/-tools envvars, just like exit-esp-tools
|
||||||
|
unset IDF_PYTHON_ENV_PATH
|
||||||
|
unset ESPIDFTOOLS_INSTALLDIR
|
||||||
|
unset IDF_PATH
|
||||||
|
unset ESP_IDF_VERSION
|
||||||
|
unset IDF_PYTHON_ENV_PATH
|
||||||
|
unset OPENOCD_SCRIPTS
|
||||||
|
unset ESP_ROM_ELF_DIR
|
||||||
|
unset IDF_DEACTIVATE_FILE_PATH
|
||||||
|
unset IDF_TOOLS_INSTALL_CMD
|
||||||
|
unset IDF_TOOLS_EXPORT_CMD
|
||||||
|
unset ESPPORT
|
||||||
|
unset ESPBAUD
|
||||||
|
unset ESPTARGET
|
||||||
else
|
else
|
||||||
writeToLog "Sanity check: Environment correct\n\tNo esp-idf environment variables found, proceeding\n"
|
writeToLog "Sanity check: Environment correct\n\tNo esp-idf environment variables found, proceeding\n"
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user