fix(scripts): resolve lua51 detection failure and remove obsolete environment system
- Fix variable inconsistency: LUA_CMD -> LUA_COMMAND throughout script - Remove obsolete .env/environment loading - furt reads furt.conf directly - Add config check for furt.conf (system or project location) - Implement robust lua51 detection with fallback to lua5.1 - Support all target distributions: Arch, OpenBSD, Debian, FreeBSD - Add clear installation instructions for missing dependencies - Allow custom lua path via LUA_COMMAND variable override This resolves the lua51 detection regression and simplifies the boot process by eliminating dual config systems (environment vs furt.conf). Fixes DAW/furt#91
This commit is contained in:
parent
dfeaca55ae
commit
9b19b6a95b
1 changed files with 46 additions and 96 deletions
142
scripts/start.sh
142
scripts/start.sh
|
|
@ -1,116 +1,66 @@
|
|||
#!/bin/sh
|
||||
# furt-lua/scripts/start.sh
|
||||
# Start script for Furt Lua HTTP-Server
|
||||
|
||||
# furt-lua/scripts/start.sh - Bereinigt ohne obsoletes Environment-System
|
||||
set -e
|
||||
|
||||
# Colors for output
|
||||
# Colors
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[1;33m'
|
||||
NC='\033[0m' # No Color
|
||||
NC='\033[0m'
|
||||
|
||||
# Script directory (POSIX-compatible)
|
||||
SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
|
||||
PROJECT_DIR="$(dirname "$SCRIPT_DIR")" # für src/, cd
|
||||
REPO_ROOT="$(dirname "$(dirname "$SCRIPT_DIR")")" # für .env
|
||||
PROJECT_DIR="$(dirname "$SCRIPT_DIR")"
|
||||
|
||||
echo -e "${GREEN}=== Furt Lua HTTP-Server Startup ===${NC}"
|
||||
|
||||
# Check required dependencies
|
||||
echo -e "${YELLOW}Checking dependencies...${NC}"
|
||||
# User can override this manually if needed:
|
||||
LUA_COMMAND=""
|
||||
|
||||
# Load environment variables - Universal Config Detection
|
||||
echo -e "${YELLOW}Loading environment variables...${NC}"
|
||||
if [ -f "$REPO_ROOT/.env" ]; then
|
||||
echo -e "${GREEN}[OK]${NC} Loading from $REPO_ROOT/.env"
|
||||
export $(grep -v '^#' "$REPO_ROOT/.env" | grep -v '^$' | xargs)
|
||||
elif [ -f "/usr/local/etc/furt/environment" ]; then
|
||||
echo -e "${GREEN}[OK]${NC} Loading from /usr/local/etc/furt/environment"
|
||||
export $(grep -v '^#' /usr/local/etc/furt/environment | grep -v '^$' | xargs)
|
||||
elif [ -f "/etc/furt/environment" ]; then
|
||||
echo -e "${GREEN}[OK]${NC} Loading from /etc/furt/environment"
|
||||
export $(grep -v '^#' /etc/furt/environment | grep -v '^$' | xargs)
|
||||
else
|
||||
echo -e "${YELLOW}[WARN]${NC} No config file found in project root or system"
|
||||
fi
|
||||
|
||||
# Setup Lua from config (after loading environment)
|
||||
LUA_CMD="${LUA_COMMAND:-lua51}"
|
||||
LUA_VER="${LUA_VERSION:-5.1}"
|
||||
|
||||
# Check if configured Lua is installed (POSIX-compatible)
|
||||
if ! [ -x "$LUA_CMD" ]; then
|
||||
echo -e "${RED}Error: $LUA_CMD is not installed${NC}"
|
||||
echo "Install with: pkg_add lua51 (OpenBSD) or apt install lua5.1 (Ubuntu)"
|
||||
# Config check first (like old .env check)
|
||||
if [ ! -f "/usr/local/etc/furt/furt.conf" ] && [ ! -f "$PROJECT_DIR/config/furt.conf" ]; then
|
||||
echo -e "${RED}Error: furt.conf not found${NC}"
|
||||
echo "Create config first in /usr/local/etc/furt/furt.conf or $PROJECT_DIR/config/furt.conf"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Check Lua version
|
||||
LUA_VERSION_OUTPUT=$($LUA_CMD -v 2>&1 | head -n1)
|
||||
echo -e "${YELLOW}Lua command:${NC} $LUA_CMD ($LUA_VERSION_OUTPUT)"
|
||||
|
||||
# Test lua-socket
|
||||
$LUA_CMD -e "require('socket')" 2>/dev/null || {
|
||||
echo -e "${RED}Error: lua-socket not found for $LUA_CMD${NC}"
|
||||
echo "Install with: pkg_add lua51-socket (OpenBSD) or apt install lua-socket (Ubuntu)"
|
||||
exit 1
|
||||
}
|
||||
echo -e "${GREEN}✓${NC} lua-socket found"
|
||||
|
||||
# Test lua-cjson (system or luarocks)
|
||||
LUA_PATH="$HOME/.luarocks/share/lua/$LUA_VER/?.lua;;" \
|
||||
LUA_CPATH="$HOME/.luarocks/lib/lua/$LUA_VER/?.so;;" \
|
||||
$LUA_CMD -e "require('cjson')" 2>/dev/null || {
|
||||
echo -e "${RED}Error: lua-cjson not found for $LUA_CMD${NC}"
|
||||
echo "Install with: pkg_add lua51-cjson (OpenBSD) or luarocks install lua-cjson"
|
||||
exit 1
|
||||
}
|
||||
echo -e "${GREEN}✓${NC} lua-cjson found"
|
||||
|
||||
# Test lua-ssl (optional for HTTPS)
|
||||
LUA_PATH="$HOME/.luarocks/share/lua/$LUA_VER/?.lua;;" \
|
||||
LUA_CPATH="$HOME/.luarocks/lib/lua/$LUA_VER/?.so;;" \
|
||||
$LUA_CMD -e "require('ssl')" 2>/dev/null && {
|
||||
echo -e "${GREEN}✓${NC} lua-ssl found (HTTPS ready)"
|
||||
} || {
|
||||
echo -e "${YELLOW}○${NC} lua-ssl not found (install with: luarocks install luaossl)"
|
||||
}
|
||||
|
||||
# Check SMTP configuration (korrekte Variable-Namen)
|
||||
if [ -n "$SMTP_USERNAME" ] && [ -n "$SMTP_PASSWORD" ]; then
|
||||
echo -e "${GREEN}[OK]${NC} SMTP configured: $SMTP_USERNAME"
|
||||
else
|
||||
echo -e "${YELLOW}[WARN]${NC} SMTP credentials missing in .env"
|
||||
echo "Add SMTP_USERNAME and SMTP_PASSWORD to .env"
|
||||
if [ -z "$LUA_COMMAND" ]; then
|
||||
# Test standard distribution paths
|
||||
for cmd in lua51 lua5.1; do
|
||||
if command -v "$cmd" >/dev/null 2>&1; then
|
||||
LUA_COMMAND="$cmd"
|
||||
break
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
# Change to project directory
|
||||
if [ -z "$LUA_COMMAND" ]; then
|
||||
echo -e "${RED}Error: No Lua 5.1 found${NC}"
|
||||
echo "Install options:"
|
||||
echo " Arch: pacman -S lua51"
|
||||
echo " OpenBSD: pkg_add lua51"
|
||||
echo " Debian: apt install lua5.1"
|
||||
echo " FreeBSD: pkg install lua51"
|
||||
echo ""
|
||||
echo "Or set: LUA_COMMAND=/custom/path/lua51 at top of this script"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo -e "${GREEN}Found Lua:${NC} $LUA_COMMAND"
|
||||
|
||||
# Dependency checks (lua-socket, lua-cjson)
|
||||
$LUA_COMMAND -e "require('socket')" 2>/dev/null || {
|
||||
echo -e "${RED}Error: lua-socket not found${NC}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
$LUA_COMMAND -e "require('cjson')" 2>/dev/null || {
|
||||
echo -e "${RED}Error: lua-cjson not found${NC}"
|
||||
exit 1
|
||||
}
|
||||
|
||||
cd "$PROJECT_DIR"
|
||||
|
||||
# Add current directory and luarocks to Lua path for requires (dynamic version)
|
||||
export LUA_PATH="$PROJECT_DIR/src/?.lua;$PROJECT_DIR/?.lua;$HOME/.luarocks/share/lua/$LUA_VER/?.lua;;"
|
||||
export LUA_CPATH="$HOME/.luarocks/lib/lua/$LUA_VER/?.so;;"
|
||||
|
||||
echo -e "${GREEN}Starting Furt HTTP-Server...${NC}"
|
||||
echo -e "${YELLOW}Project directory:${NC} $PROJECT_DIR"
|
||||
echo -e "${YELLOW}Lua paths configured for $LUA_CMD (version $LUA_VER)${NC}"
|
||||
echo ""
|
||||
|
||||
# Auto-detect service context
|
||||
if [ ! -t 0 ] || [ ! -t 1 ]; then
|
||||
# No TTY = Service mode (rcctl)
|
||||
echo "Starting Furt in daemon mode..."
|
||||
$LUA_CMD src/main.lua &
|
||||
echo "Furt started (PID: $!)"
|
||||
else
|
||||
# Interactive mode (manual/development)
|
||||
# echo "Furt HTTP-Server started on 127.0.0.1:8080"
|
||||
# echo "Press Ctrl+C to stop"
|
||||
$LUA_CMD src/main.lua
|
||||
fi
|
||||
|
||||
|
||||
# Start server
|
||||
# $LUA_CMD src/main.lua
|
||||
echo -e "${GREEN}Starting Furt...${NC}"
|
||||
# Furt liest selbst seine Config aus furt.conf
|
||||
exec "$LUA_COMMAND" src/main.lua
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue