Skip to content

Commit

Permalink
scripts: Fix the names of the DECOMPILE_ARCHIVE_SH and DECOMPILE_ARCH…
Browse files Browse the repository at this point in the history
…IVE_SH_PARAMS variables.

Instead of `decompile-archive.sh`, we now have `retdec-archive-decompiler.sh`.
We should reflect this in the names of the variables.
  • Loading branch information
s3rvac committed Apr 2, 2018
1 parent 9385f93 commit 1647e9f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion scripts/retdec-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ PAT2YARA="$INSTALL_BIN_DIR/retdec-pat2yara"
CONFIGTOOL="$INSTALL_BIN_DIR/retdec-config"
EXTRACT="$INSTALL_BIN_DIR/retdec-macho-extractor"
DECOMPILER_SH="$INSTALL_BIN_DIR/retdec-decompiler.sh"
DECOMPILE_ARCHIVE_SH="$INSTALL_BIN_DIR/retdec-archive-decompiler.sh"
ARCHIVE_DECOMPILER_SH="$INSTALL_BIN_DIR/retdec-archive-decompiler.sh"
SIG_FROM_LIB_SH="$INSTALL_BIN_DIR/retdec-signature-from-library-creator.sh"
UNPACK_SH="$INSTALL_BIN_DIR/retdec-unpacker.sh"
LLVMIR2HLL="$INSTALL_BIN_DIR/retdec-llvmir2hll"
Expand Down
6 changes: 3 additions & 3 deletions scripts/retdec-fileinfo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,15 +42,15 @@ for arg in "$@"; do

# The input file is an archive, so use the archive decompilation script
# instead of fileinfo.
DECOMPILE_ARCHIVE_SH_PARAMS=("$IN" --list)
ARCHIVE_DECOMPILER_SH_PARAMS=("$IN" --list)
# When a JSON output was requested (any of the parameters is
# -j/--json), forward it to the archive decompilation script.
for arg in "$@"; do
if [ "$arg" = "-j" ] || [ "$arg" = "--json" ]; then
DECOMPILE_ARCHIVE_SH_PARAMS+=(--json)
ARCHIVE_DECOMPILER_SH_PARAMS+=(--json)
fi
done
"$DECOMPILE_ARCHIVE_SH" "${DECOMPILE_ARCHIVE_SH_PARAMS[@]}"
"$ARCHIVE_DECOMPILER_SH" "${ARCHIVE_DECOMPILER_SH_PARAMS[@]}"
exit $?
fi
done
Expand Down

0 comments on commit 1647e9f

Please sign in to comment.