mirror of
https://github.com/smittix/intercept.git
synced 2026-06-06 05:01:55 -07:00
Improve gr-gsm installation error reporting in setup.sh
- Remove output suppression so errors are visible - Add clearer error messages at each step - Fix subshell isolation that was swallowing errors Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -464,11 +464,11 @@ install_grgsm_from_source_debian() {
|
|||||||
# Check if GNU Radio is available
|
# Check if GNU Radio is available
|
||||||
if ! cmd_exists gnuradio-config-info; then
|
if ! cmd_exists gnuradio-config-info; then
|
||||||
info "GNU Radio not found. Installing GNU Radio first..."
|
info "GNU Radio not found. Installing GNU Radio first..."
|
||||||
$SUDO apt-get install -y gnuradio gnuradio-dev >/dev/null 2>&1 || {
|
if ! $SUDO apt-get install -y gnuradio gnuradio-dev; then
|
||||||
warn "Failed to install GNU Radio. gr-gsm requires GNU Radio 3.8+."
|
warn "Failed to install GNU Radio. gr-gsm requires GNU Radio 3.8+."
|
||||||
warn "GSM scanning will not be available."
|
warn "GSM scanning will not be available."
|
||||||
return 1
|
return 1
|
||||||
}
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Check GNU Radio version (need 3.8+)
|
# Check GNU Radio version (need 3.8+)
|
||||||
@@ -498,35 +498,58 @@ install_grgsm_from_source_debian() {
|
|||||||
libosmogsm-dev \
|
libosmogsm-dev \
|
||||||
libosmovty-dev \
|
libosmovty-dev \
|
||||||
libosmocodec-dev \
|
libosmocodec-dev \
|
||||||
>/dev/null 2>&1 || {
|
|| {
|
||||||
warn "Some gr-gsm dependencies failed to install."
|
warn "Some gr-gsm dependencies failed to install."
|
||||||
warn "Attempting to continue anyway..."
|
warn "Attempting to continue anyway..."
|
||||||
}
|
}
|
||||||
|
|
||||||
# Run in subshell to isolate EXIT trap
|
# Build gr-gsm
|
||||||
(
|
local tmp_dir
|
||||||
tmp_dir="$(mktemp -d)"
|
tmp_dir="$(mktemp -d)"
|
||||||
trap 'rm -rf "$tmp_dir"' EXIT
|
|
||||||
|
|
||||||
info "Cloning gr-gsm..."
|
info "Cloning gr-gsm..."
|
||||||
git clone --depth 1 https://github.com/ptrkrysik/gr-gsm.git "$tmp_dir/gr-gsm" >/dev/null 2>&1 \
|
if ! git clone --depth 1 https://github.com/ptrkrysik/gr-gsm.git "$tmp_dir/gr-gsm"; then
|
||||||
|| { warn "Failed to clone gr-gsm"; exit 1; }
|
warn "Failed to clone gr-gsm repository"
|
||||||
|
rm -rf "$tmp_dir"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
cd "$tmp_dir/gr-gsm"
|
cd "$tmp_dir/gr-gsm"
|
||||||
mkdir -p build && cd build
|
mkdir -p build && cd build
|
||||||
|
|
||||||
info "Compiling gr-gsm (this may take a few minutes)..."
|
info "Configuring gr-gsm..."
|
||||||
if cmake .. >/dev/null 2>&1 && make -j$(nproc) >/dev/null 2>&1; then
|
if ! cmake ..; then
|
||||||
$SUDO make install >/dev/null 2>&1
|
warn "Failed to configure gr-gsm (cmake failed)"
|
||||||
$SUDO ldconfig
|
warn "Check that all dependencies are installed"
|
||||||
ok "gr-gsm installed successfully."
|
cd /
|
||||||
info "grgsm_scanner should now be available for GSM cell detection."
|
rm -rf "$tmp_dir"
|
||||||
else
|
return 1
|
||||||
warn "Failed to build gr-gsm from source."
|
fi
|
||||||
warn "GSM cell scanning will not be available in ISMS mode."
|
|
||||||
warn "You can try installing manually from: https://github.com/ptrkrysik/gr-gsm"
|
info "Compiling gr-gsm (this may take a few minutes)..."
|
||||||
fi
|
if ! make -j$(nproc); then
|
||||||
)
|
warn "Failed to compile gr-gsm"
|
||||||
|
warn "Check the build output above for errors"
|
||||||
|
cd /
|
||||||
|
rm -rf "$tmp_dir"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
info "Installing gr-gsm..."
|
||||||
|
if $SUDO make install && $SUDO ldconfig; then
|
||||||
|
ok "gr-gsm installed successfully."
|
||||||
|
info "grgsm_scanner should now be available for GSM cell detection."
|
||||||
|
else
|
||||||
|
warn "Failed to install gr-gsm"
|
||||||
|
cd /
|
||||||
|
rm -rf "$tmp_dir"
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Cleanup
|
||||||
|
cd /
|
||||||
|
rm -rf "$tmp_dir"
|
||||||
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
install_rtlsdr_blog_drivers_debian() {
|
install_rtlsdr_blog_drivers_debian() {
|
||||||
|
|||||||
Reference in New Issue
Block a user