Developer
297377b7c6
CRITICAL FIXES: - TERMINAL CRASH: Changed 'exit 1' to 'return 1' in library sourcing (lines 21-25) Cause: When launcher.sh sourced from run.sh, 'exit' terminated the parent shell Impact: Terminal no longer crashes when libraries fail to load - CLEANUP FILE PATH: Simplified cleanup file creation to use consistent path Old: Created random temp file with mktemp (never checked by run.sh) New: Direct creation of /tmp/.cleanup_requested (checked by run.sh) Impact: Cleanup now works correctly on exit HIGH PRIORITY: - DATABASE QUERY OPTIMIZATION: Replaced 4 separate grep -c calls with single awk pass Old: 4 separate grep calls on same file (lines 666-669) New: Single awk pass with field counting (line 671) Impact: ~75% faster startup detection summary display MEDIUM PRIORITY: - CONSISTENT ERROR HANDLING: Standardized all read commands to use explicit failure checks Pattern: if ! read ... </dev/tty 2>/dev/null; then ... fi Applied to: startup detection prompt (line 681), main menu (line 705), cleanup prompt (line 720) Impact: Clearer error handling throughout launcher - DIRECTORY INITIALIZATION: Moved init_directories out of main loop Old: Called on every main() invocation New: Called once at startup with error handling Impact: Fewer redundant directory creation attempts - RUN.SH ERROR HANDLING: Added error handling for launcher.sh sourcing Added: Check for successful launcher.sh load with helpful error message Impact: Better failure diagnostics if launcher fails to load VERIFICATION: - Tested startup flow: Launcher initializes without crashes - Verified menu displays correctly - Confirmed cleanup file path consistency - All error handling patterns standardized
68 lines
2.0 KiB
Bash
Executable File
68 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
################################################################################
|
|
# Wrapper script for Server Toolkit
|
|
################################################################################
|
|
# This wrapper allows proper history cleanup by running in the current shell
|
|
################################################################################
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
|
|
# Fix HISTFILE if set to non-existent path (prevents crashes on sourcing)
|
|
if [ -n "$HISTFILE" ]; then
|
|
HISTFILE_DIR="$(dirname "$HISTFILE" 2>/dev/null)"
|
|
if [ ! -d "$HISTFILE_DIR" ]; then
|
|
# Fallback to default history location
|
|
export HISTFILE="$HOME/.bash_history"
|
|
fi
|
|
fi
|
|
|
|
# Check if being sourced or executed
|
|
if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
|
|
echo "ERROR: This script must be sourced, not executed."
|
|
echo ""
|
|
echo "Run it like this:"
|
|
echo " source $0"
|
|
echo ""
|
|
echo "Or use the alias:"
|
|
echo " . $0"
|
|
exit 1
|
|
fi
|
|
|
|
# Run the launcher (source in current shell, don't execute in subshell)
|
|
source "$SCRIPT_DIR/launcher.sh" || {
|
|
echo "ERROR: Failed to load launcher.sh"
|
|
return 1
|
|
}
|
|
|
|
# Check if cleanup is requested
|
|
if [ -f /tmp/.cleanup_requested ]; then
|
|
rm -f /tmp/.cleanup_requested
|
|
|
|
# Clean history in current shell
|
|
GREP_PATTERN="git\.mull\.lol|linux-server-management-toolkit|server-toolkit|launcher\.sh|erase-toolkit-traces|run\.sh"
|
|
|
|
if [ -f ~/.bash_history ]; then
|
|
cp ~/.bash_history ~/.bash_history.bak.$$
|
|
grep -Ev "$GREP_PATTERN" ~/.bash_history.bak.$$ > ~/.bash_history 2>/dev/null || true
|
|
rm -f ~/.bash_history.bak.$$
|
|
fi
|
|
|
|
# Clear current shell's history
|
|
history -c
|
|
history -r ~/.bash_history
|
|
unset HISTFILE
|
|
set +o history
|
|
|
|
# Remove toolkit directory
|
|
cd /root 2>/dev/null
|
|
rm -rf "$SCRIPT_DIR" 2>/dev/null
|
|
|
|
clear
|
|
echo ""
|
|
echo "✓ All traces removed"
|
|
echo ""
|
|
echo "Type 'exit' and start a new shell."
|
|
echo ""
|
|
fi
|