Compare commits
No commits in common. "d2babeba279a67cc163cf3a9e376c9e05b566d41" and "4c68a1ac07d4a9c20513e4223786d0e1046df5bf" have entirely different histories.
d2babeba27
...
4c68a1ac07
@ -62,19 +62,6 @@ fi
|
|||||||
echo -e "${YELLOW}Running the main installer...${NC}"
|
echo -e "${YELLOW}Running the main installer...${NC}"
|
||||||
cd "$INSTALL_DIR"
|
cd "$INSTALL_DIR"
|
||||||
chmod +x main-installer.sh
|
chmod +x main-installer.sh
|
||||||
|
|
||||||
# Let the user know what's about to happen
|
|
||||||
echo -e "${YELLOW}You will now be asked for configuration options including:${NC}"
|
|
||||||
echo -e "- Installation directory"
|
|
||||||
echo -e "- User to run the service as"
|
|
||||||
echo -e "- Whether Transmission is running on a remote server"
|
|
||||||
echo -e "- Transmission connection details"
|
|
||||||
echo -e "- Media organization preferences"
|
|
||||||
echo
|
|
||||||
|
|
||||||
# Add small delay to ensure user sees this message
|
|
||||||
sleep 2
|
|
||||||
|
|
||||||
./main-installer.sh
|
./main-installer.sh
|
||||||
|
|
||||||
# Installation complete
|
# Installation complete
|
||||||
|
@ -12,9 +12,6 @@ YELLOW='\033[0;33m'
|
|||||||
RED='\033[0;31m'
|
RED='\033[0;31m'
|
||||||
NC='\033[0m' # No Color
|
NC='\033[0m' # No Color
|
||||||
|
|
||||||
# Get current directory
|
|
||||||
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
|
||||||
|
|
||||||
# Print header
|
# Print header
|
||||||
echo -e "${BOLD}==================================================${NC}"
|
echo -e "${BOLD}==================================================${NC}"
|
||||||
echo -e "${BOLD} Transmission RSS Manager Installer ${NC}"
|
echo -e "${BOLD} Transmission RSS Manager Installer ${NC}"
|
||||||
@ -29,6 +26,9 @@ if [ "$EUID" -ne 0 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Get current directory
|
||||||
|
SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )"
|
||||||
|
|
||||||
# Check for installation type
|
# Check for installation type
|
||||||
IS_UPDATE=false
|
IS_UPDATE=false
|
||||||
INSTALLATION_DETECTED=false
|
INSTALLATION_DETECTED=false
|
||||||
@ -99,9 +99,6 @@ trap 'cleanup_on_error "$BASH_COMMAND"' ERR
|
|||||||
# Execute the installation steps in sequence
|
# Execute the installation steps in sequence
|
||||||
log "INFO" "Starting installation process..."
|
log "INFO" "Starting installation process..."
|
||||||
|
|
||||||
# Set default for TRANSMISSION_REMOTE
|
|
||||||
export TRANSMISSION_REMOTE=false
|
|
||||||
|
|
||||||
if [ "$IS_UPDATE" = true ]; then
|
if [ "$IS_UPDATE" = true ]; then
|
||||||
log "INFO" "Running in update mode - preserving existing configuration..."
|
log "INFO" "Running in update mode - preserving existing configuration..."
|
||||||
|
|
||||||
@ -135,16 +132,10 @@ else
|
|||||||
|
|
||||||
# Step 1: Gather configuration from user
|
# Step 1: Gather configuration from user
|
||||||
log "INFO" "Gathering configuration..."
|
log "INFO" "Gathering configuration..."
|
||||||
# Explicitly run this to ensure it's called before dependencies
|
gather_configuration || {
|
||||||
set +e # Temporarily disable exit on error
|
|
||||||
if ! gather_configuration; then
|
|
||||||
log "ERROR" "Configuration gathering failed"
|
log "ERROR" "Configuration gathering failed"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
}
|
||||||
set -e # Re-enable exit on error
|
|
||||||
|
|
||||||
# Debug: Verify TRANSMISSION_REMOTE is set
|
|
||||||
log "INFO" "After configuration gathering, TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
|
||||||
|
|
||||||
# Step 2: Install dependencies
|
# Step 2: Install dependencies
|
||||||
log "INFO" "Installing dependencies..."
|
log "INFO" "Installing dependencies..."
|
||||||
|
@ -75,12 +75,6 @@ validate_hostname() {
|
|||||||
|
|
||||||
function gather_configuration() {
|
function gather_configuration() {
|
||||||
log "INFO" "Starting configuration gathering"
|
log "INFO" "Starting configuration gathering"
|
||||||
|
|
||||||
# Initialize default values for Transmission mode
|
|
||||||
export TRANSMISSION_REMOTE=false
|
|
||||||
|
|
||||||
# Set flag to indicate that configuration was gathered
|
|
||||||
export CONFIG_GATHERED=true
|
|
||||||
echo -e "${BOLD}Installation Configuration:${NC}"
|
echo -e "${BOLD}Installation Configuration:${NC}"
|
||||||
echo -e "Please provide the following configuration parameters:"
|
echo -e "Please provide the following configuration parameters:"
|
||||||
echo
|
echo
|
||||||
|
@ -4,33 +4,6 @@
|
|||||||
function install_dependencies() {
|
function install_dependencies() {
|
||||||
log "INFO" "Installing dependencies..."
|
log "INFO" "Installing dependencies..."
|
||||||
|
|
||||||
# Make sure TRANSMISSION_REMOTE variable is set
|
|
||||||
if [ -z "$TRANSMISSION_REMOTE" ]; then
|
|
||||||
# Set default to false if not defined
|
|
||||||
export TRANSMISSION_REMOTE=false
|
|
||||||
log "WARN" "TRANSMISSION_REMOTE variable was not set, defaulting to local installation"
|
|
||||||
fi
|
|
||||||
|
|
||||||
log "INFO" "Transmission mode: $([ "$TRANSMISSION_REMOTE" = true ] && echo "Remote" || echo "Local")"
|
|
||||||
|
|
||||||
# Debug: print out whether the gather_configuration was called
|
|
||||||
if [ "$IS_UPDATE" != true ]; then
|
|
||||||
if [ -z "$CONFIG_GATHERED" ]; then
|
|
||||||
log "ERROR" "Configuration step was skipped! This is a bug."
|
|
||||||
log "INFO" "Please report this issue. Will now manually ask about Transmission location."
|
|
||||||
|
|
||||||
# Emergency fix: Ask about remote installation here
|
|
||||||
read -p "Is Transmission running on a remote server? (y/n) [n]: " input_remote
|
|
||||||
if [[ $input_remote =~ ^[Yy]$ ]]; then
|
|
||||||
export TRANSMISSION_REMOTE=true
|
|
||||||
log "INFO" "Remote Transmission selected."
|
|
||||||
else
|
|
||||||
export TRANSMISSION_REMOTE=false
|
|
||||||
log "INFO" "Local Transmission selected."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Check for package manager
|
# Check for package manager
|
||||||
if command -v apt-get &> /dev/null; then
|
if command -v apt-get &> /dev/null; then
|
||||||
# Update package index
|
# Update package index
|
||||||
|
Loading…
x
Reference in New Issue
Block a user