Reorganize project structure: move code to src/, docs to docs/, config to config/, scripts to scripts/, results to results/, tests to tests/. Keep only main script and latest scan results in root.
This commit is contained in:
@@ -33,8 +33,8 @@ log_error() {
|
||||
}
|
||||
|
||||
# Check if we're in the right directory
|
||||
if [ ! -f "integrated_scanner.py" ]; then
|
||||
log_error "integrated_scanner.py not found. Please run this script from the network scanner directory."
|
||||
if [ ! -f "src/integrated_scanner.py" ]; then
|
||||
log_error "src/integrated_scanner.py not found. Please run this script from the network scanner directory."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
@@ -48,7 +48,7 @@ fi
|
||||
|
||||
# Step 1: Run system verification
|
||||
log_info "Step 1: Verifying system requirements..."
|
||||
if ./test_system.py >/dev/null 2>&1; then
|
||||
if python3 src/test_system.py >/dev/null 2>&1; then
|
||||
log_success "System verification passed"
|
||||
else
|
||||
log_error "System verification failed. Please check the output above."
|
||||
@@ -58,7 +58,7 @@ fi
|
||||
# Step 2: Run integrated network scan
|
||||
log_info "Step 2: Running integrated network scan..."
|
||||
SCAN_OUTPUT="network_scan_$(date +%Y%m%d_%H%M%S).json"
|
||||
if ./integrated_scanner.py -o "$SCAN_OUTPUT" -v; then
|
||||
if python3 src/integrated_scanner.py -o "$SCAN_OUTPUT" -v; then
|
||||
log_success "Network scan completed: $SCAN_OUTPUT"
|
||||
else
|
||||
log_error "Network scan failed"
|
||||
@@ -68,7 +68,7 @@ fi
|
||||
# Step 3: Generate SVG diagram
|
||||
log_info "Step 3: Generating network diagram..."
|
||||
SVG_OUTPUT="${SCAN_OUTPUT%.json}.svg"
|
||||
if ./svg_generator.py "$SCAN_OUTPUT" -o "$SVG_OUTPUT"; then
|
||||
if python3 src/svg_generator.py "$SCAN_OUTPUT" -o "$SVG_OUTPUT"; then
|
||||
log_success "SVG diagram generated: $SVG_OUTPUT"
|
||||
else
|
||||
log_error "SVG generation failed"
|
||||
@@ -79,7 +79,7 @@ fi
|
||||
if [ "$XML_FILES" -gt 0 ]; then
|
||||
log_info "Step 4: Generating pfSense network summary..."
|
||||
SUMMARY_OUTPUT="network_summary_$(date +%Y%m%d_%H%M%S).md"
|
||||
if ./pfsense_integrator.py *.xml --summary "$SUMMARY_OUTPUT"; then
|
||||
if python3 src/pfsense_integrator.py *.xml --summary "$SUMMARY_OUTPUT"; then
|
||||
log_success "Network summary generated: $SUMMARY_OUTPUT"
|
||||
else
|
||||
log_warning "Network summary generation failed"
|
||||
|
||||
Reference in New Issue
Block a user