mirror of
https://github.com/ChuckBuilds/LEDMatrix.git
synced 2026-04-10 13:02:59 +00:00
Fix/plugin permission errors (#181)
* fix: Use plugin.modes instead of manifest.json for available modes - Display controller now checks plugin_instance.modes first before falling back to manifest - This allows plugins to dynamically provide modes based on enabled leagues - Fixes issue where disabled leagues (WNBA, NCAAW) appeared in available modes - Plugins can now control their available modes at runtime based on config * fix: Handle permission errors when removing plugin directories - Added _safe_remove_directory() method to handle permission errors gracefully - Fixes permissions on __pycache__ directories before removal - Updates uninstall_plugin() and install methods to use safe removal - Resolves [Errno 13] Permission denied errors during plugin install/uninstall * refactor: Improve error handling in _safe_remove_directory - Rename unused 'dirs' variable to '_dirs' to indicate intentional non-use - Use logger.exception() instead of logger.error() to preserve stack traces - Add comment explaining 0o777 permissions are acceptable (temporary before deletion) * fix(install): Fix one-shot-install script reliability issues - Install git and curl before attempting repository clone - Add HOME variable validation to prevent path errors - Improve git branch detection (try current branch, main, then master) - Add validation for all directory change operations - Improve hostname command handling in success message - Fix edge cases for better installation success rate * fix(install): Fix IP address display in installation completion message - Replace unreliable pipe-to-while-read loop with direct for loop - Filter out loopback addresses (127.0.0.1, ::1) from display - Add proper message when no non-loopback IPs are found - Fixes blank IP address display issue at end of installation * fix(install): Prevent unintended merges in one-shot-install git pull logic - Use git pull --ff-only for current branch to avoid unintended merges - Use git fetch (not pull) for other branches to check existence without merging - Only update current branch if fast-forward is possible - Provide better warnings when branch updates fail but other branches exist - Prevents risk of merging remote main/master into unrelated working branches * fix(install): Improve IPv6 address handling in installation scripts - Filter out IPv6 link-local addresses (fe80:) in addition to loopback - Properly format IPv6 addresses with brackets in URLs (http://[::1]:5000) - Filter loopback and link-local addresses when selecting IP for display - Prevents invalid IPv6 URLs and excludes non-useful addresses - Fixes: first_time_install.sh and one-shot-install.sh IP display logic --------- Co-authored-by: Chuck <chuck@example.com>
This commit is contained in:
Chuck
@@ -1405,13 +1405,21 @@ echo ""
|
||||
# Get current IP addresses
|
||||
echo "Current IP Addresses:"
|
||||
if command -v hostname >/dev/null 2>&1; then
|
||||
IPS=$(hostname -I 2>/dev/null | tr ' ' '\n' | grep -v '^$' || echo "")
|
||||
# Get IP addresses and filter out empty lines
|
||||
IPS=$(hostname -I 2>/dev/null || echo "")
|
||||
if [ -n "$IPS" ]; then
|
||||
echo "$IPS" | while read -r ip; do
|
||||
if [ -n "$ip" ]; then
|
||||
echo " - $ip"
|
||||
fi
|
||||
done
|
||||
# Use a more reliable method to process IPs
|
||||
FOUND_IPS=0
|
||||
for ip in $IPS; do
|
||||
# Filter out loopback, empty strings, and IPv6 link-local addresses (fe80:)
|
||||
if [ -n "$ip" ] && [ "$ip" != "127.0.0.1" ] && [ "$ip" != "::1" ] && ! [[ "$ip" =~ ^fe80: ]]; then
|
||||
echo " - $ip"
|
||||
FOUND_IPS=1
|
||||
fi
|
||||
done
|
||||
if [ "$FOUND_IPS" -eq 0 ]; then
|
||||
echo " ⚠ No non-loopback IP addresses found"
|
||||
fi
|
||||
else
|
||||
echo " ⚠ No IP addresses found"
|
||||
fi
|
||||
|
||||
@@ -210,6 +210,37 @@ main() {
|
||||
# Note: /tmp permissions are checked and fixed inline before running first_time_install.sh
|
||||
# (only if actually wrong, not preemptively)
|
||||
|
||||
# Install basic system dependencies needed for cloning
|
||||
CURRENT_STEP="Installing system dependencies"
|
||||
print_step "Installing system dependencies..."
|
||||
|
||||
# Validate HOME variable
|
||||
if [ -z "${HOME:-}" ]; then
|
||||
print_error "HOME environment variable is not set"
|
||||
echo "Please set HOME or run: export HOME=\$(eval echo ~\$(whoami))"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Update package list first
|
||||
if [ "$EUID" -eq 0 ]; then
|
||||
retry apt-get update -qq
|
||||
else
|
||||
retry sudo apt-get update -qq
|
||||
fi
|
||||
|
||||
# Install git and curl (needed for cloning and the script itself)
|
||||
if ! command -v git >/dev/null 2>&1 || ! command -v curl >/dev/null 2>&1; then
|
||||
print_warning "git or curl not found, installing..."
|
||||
if [ "$EUID" -eq 0 ]; then
|
||||
retry apt-get install -y git curl
|
||||
else
|
||||
retry sudo apt-get install -y git curl
|
||||
fi
|
||||
print_success "git and curl installed"
|
||||
else
|
||||
print_success "git and curl already installed"
|
||||
fi
|
||||
|
||||
# Determine repository location
|
||||
REPO_DIR="${HOME}/LEDMatrix"
|
||||
REPO_URL="https://github.com/ChuckBuilds/LEDMatrix.git"
|
||||
@@ -222,17 +253,47 @@ main() {
|
||||
if [ -d "$REPO_DIR/.git" ]; then
|
||||
print_warning "Repository already exists at $REPO_DIR"
|
||||
print_warning "Pulling latest changes..."
|
||||
cd "$REPO_DIR"
|
||||
if git pull origin main >/dev/null 2>&1; then
|
||||
print_success "Repository updated successfully"
|
||||
if ! cd "$REPO_DIR"; then
|
||||
print_error "Failed to change to directory: $REPO_DIR"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Detect current branch or try main/master
|
||||
CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo "main")
|
||||
if [ "$CURRENT_BRANCH" = "HEAD" ] || [ -z "$CURRENT_BRANCH" ]; then
|
||||
CURRENT_BRANCH="main"
|
||||
fi
|
||||
|
||||
# Try to safely update current branch first (fast-forward only to avoid unintended merges)
|
||||
PULL_SUCCESS=false
|
||||
if git pull --ff-only origin "$CURRENT_BRANCH" >/dev/null 2>&1; then
|
||||
print_success "Repository updated successfully (branch: $CURRENT_BRANCH)"
|
||||
PULL_SUCCESS=true
|
||||
else
|
||||
# Current branch pull failed, check if other branches exist on remote
|
||||
# Fetch (don't merge) to verify remote branches exist
|
||||
for branch in "main" "master"; do
|
||||
if [ "$branch" != "$CURRENT_BRANCH" ]; then
|
||||
if git fetch origin "$branch" >/dev/null 2>&1; then
|
||||
print_warning "Current branch ($CURRENT_BRANCH) could not be updated, but remote branch '$branch' exists"
|
||||
print_warning "Consider switching branches or resolving conflicts"
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [ "$PULL_SUCCESS" = false ]; then
|
||||
print_warning "Git pull failed, but continuing with existing repository"
|
||||
print_warning "You may have local changes or the repository may be on a different branch"
|
||||
fi
|
||||
else
|
||||
print_warning "Directory exists but is not a git repository"
|
||||
print_warning "Removing and cloning fresh..."
|
||||
cd "$HOME"
|
||||
if ! cd "$HOME"; then
|
||||
print_error "Failed to change to home directory: $HOME"
|
||||
exit 1
|
||||
fi
|
||||
rm -rf "$REPO_DIR"
|
||||
print_success "Cloning repository..."
|
||||
retry git clone "$REPO_URL" "$REPO_DIR"
|
||||
@@ -254,7 +315,10 @@ main() {
|
||||
CURRENT_STEP="Main installation"
|
||||
print_step "Running main installation script..."
|
||||
|
||||
cd "$REPO_DIR"
|
||||
if ! cd "$REPO_DIR"; then
|
||||
print_error "Failed to change to repository directory: $REPO_DIR"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Make sure the script is executable
|
||||
chmod +x first_time_install.sh
|
||||
@@ -308,7 +372,24 @@ main() {
|
||||
echo ""
|
||||
echo "Next steps:"
|
||||
echo " 1. Configure your settings: sudo nano $REPO_DIR/config/config.json"
|
||||
echo " 2. Or use the web interface: http://$(hostname -I | awk '{print $1}'):5000"
|
||||
if command -v hostname >/dev/null 2>&1; then
|
||||
# Get first usable IP address (filter out loopback, IPv6 loopback, and link-local)
|
||||
IP_ADDRESS=$(hostname -I 2>/dev/null | awk '{for(i=1;i<=NF;i++){ip=$i; if(ip!="127.0.0.1" && ip!="::1" && substr(ip,1,5)!="fe80:"){print ip; exit}}}' || echo "")
|
||||
if [ -n "$IP_ADDRESS" ]; then
|
||||
# Check if IPv6 address (contains colons but no periods)
|
||||
if [[ "$IP_ADDRESS" =~ .*:.* ]] && [[ ! "$IP_ADDRESS" =~ .*\..* ]]; then
|
||||
# IPv6 addresses need brackets in URLs
|
||||
echo " 2. Or use the web interface: http://[$IP_ADDRESS]:5000"
|
||||
else
|
||||
# IPv4 address
|
||||
echo " 2. Or use the web interface: http://$IP_ADDRESS:5000"
|
||||
fi
|
||||
else
|
||||
echo " 2. Or use the web interface: http://<your-pi-ip>:5000"
|
||||
fi
|
||||
else
|
||||
echo " 2. Or use the web interface: http://<your-pi-ip>:5000"
|
||||
fi
|
||||
echo " 3. Start the service: sudo systemctl start ledmatrix.service"
|
||||
echo ""
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user