@@ -135,27 +135,28 @@ if [[ -d "${INPUT}" ]]; then
135135fi
136136
137137# clone other repo's
138- if [[ -d " ${PWD} /Firmware_extractor" ]]; then
139- git -C " ${PWD} " /Firmware_extractor pull --recurse-submodules --rebase
138+ if [[ -d " ${PWD} /external/ Firmware_extractor" ]]; then
139+ git -C " ${PWD} " /external/ Firmware_extractor pull --recurse-submodules --rebase
140140else
141- git clone -q --recurse-submodules https://github.com/AndroidDumps/Firmware_extractor " ${PWD} " /Firmware_extractor
141+ LOGI " Cloning 'Fimrware_extractor' to 'external/'..."
142+ git clone -q --recurse-submodules https://github.com/AndroidDumps/Firmware_extractor " ${PWD} " /external/Firmware_extractor
142143fi
143144
144145# Extract input via 'Firmware_extractor'
145146[[ ! -d " ${INPUT} " ]] && \
146- bash " $PWD " /Firmware_extractor/extractor.sh " ${INPUT} " " ${WORKING} " || LOGF " Extraction failed. Aborting."
147+ bash " $PWD " /external/ Firmware_extractor/extractor.sh " ${INPUT} " " ${WORKING} " || LOGF " Extraction failed. Aborting."
147148
148149# Retrive 'extract-ikconfig' from torvalds/linux
149- if ! [[ -f " ${PWD} " /extract-ikconfig ]]; then
150- curl -s -Lo " ${PWD} " /extract-ikconfig https://raw.githubusercontent.com/torvalds/linux/refs/heads/master/scripts/extract-ikconfig
151- chmod +x " ${PWD} " /extract-ikconfig
150+ if ! [[ -f " ${PWD} " /external/ extract-ikconfig ]]; then
151+ curl -s -Lo " ${PWD} " /external/ extract-ikconfig https://raw.githubusercontent.com/torvalds/linux/refs/heads/master/scripts/extract-ikconfig
152+ chmod +x " ${PWD} " /external/ extract-ikconfig
152153fi
153154
154155# Set path for tools
155- UNPACKBOOTIMG=" ${PWD} " /Firmware_extractor/tools/unpackbootimg
156+ UNPACKBOOTIMG=" ${PWD} " /external/ Firmware_extractor/tools/unpackbootimg
156157VMLINUX_TO_ELF=" uvx -q --from git+https://github.com/marin-m/vmlinux-to-elf@da14e789596d493f305688e221e9e34ebf63cbb8"
157- EXTRACT_IKCONFIG=" ${PWD} " /extract-ikconfig
158- FSCK_EROFS=" ${PWD} " /Firmware_extractor/tools/fsck.erofs
158+ EXTRACT_IKCONFIG=" ${PWD} " /external/ extract-ikconfig
159+ FSCK_EROFS=" ${PWD} " /external/ Firmware_extractor/tools/fsck.erofs
159160
160161# Initialize images extraction
161162cd " ${WORKING} " || exit
0 commit comments