Skip to content

Commit

Permalink
Merge pull request #428 from m-1-k-3/log_dir
Browse files Browse the repository at this point in the history
log dir on dep check
  • Loading branch information
m-1-k-3 committed Dec 12, 2022
2 parents 7c48e8c + 6b669dd commit c609d8a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
16 changes: 12 additions & 4 deletions emba.sh
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,8 @@ main()

export EMBA_PID="$$"
# if this is a release version set RELEASE to 1, add a banner to config/banner and name the banner with the version details
export RELEASE=1
export EMBA_VERSION="1.2.0"
export RELEASE=0
export EMBA_VERSION="1.2.x"
export STRICT_MODE=0
export UPDATE=0
export ARCH_CHECK=1
Expand Down Expand Up @@ -650,8 +650,11 @@ main()
log_folder
fi

# create log directory, if not exists and needed subdirectories
create_log_dir
# do not create a log dir for dep check
if [[ "$ONLY_DEP" -eq 0 ]]; then
# create log directory, if not exists and needed subdirectories
create_log_dir
fi

if [[ $IN_DOCKER -eq 0 ]]; then
echo "$LOG_DIR" > "$TMP_DIR"/orig_logdir
Expand Down Expand Up @@ -890,6 +893,11 @@ main()
print_output "[*] Open the web-report with$ORANGE firefox $(abs_path "$HTML_PATH/index.html")$NC\\n" "main"
fi
cleaner 0
else
# we do not need the log dir from dependency checker
if [[ -d "$LOG_DIR" ]]; then
rm -r "$LOG_DIR"
fi
fi
exit 0
else
Expand Down
2 changes: 1 addition & 1 deletion installer/IP12_avm_freetz_ng_extract.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ IP12_avm_freetz_ng_extract() {
INSTALL_APP_LIST=()
cd "$HOME_PATH" || ( echo "Could not install EMBA component Freetz-NG" && exit 1 )

print_file_info "execstack" "execstack for Freetz-NG" "http://ftp.br.debian.org/debian/pool/main/p/prelink/execstack_0.0.20131005-1+b10_amd64.deb" "external/freetz-ng/execstack_0.0.20131005-1+b10_amd64.deb"
print_file_info "execstack" "execstack for Freetz-NG" "http://ftp.br.debian.org/debian/pool/main/p/prelink/execstack_0.0.20131005-1+b10_amd64.deb" "external/execstack_0.0.20131005-1+b10_amd64.deb"
print_tool_info "wget" 1
print_tool_info "gcc" 1
print_tool_info "make" 1
Expand Down

0 comments on commit c609d8a

Please sign in to comment.