Compare commits
No commits in common. "b54086cfd09852826494724d59af27668092f521" and "1795373b4248f5c9333b8a8d3fcda6cc3f856b67" have entirely different histories.
b54086cfd0
...
1795373b42
@ -1166,36 +1166,4 @@ fi
|
||||
|
||||
# Launch the main installer
|
||||
echo -e "${GREEN}Launching main installer...${NC}"
|
||||
|
||||
# Ask about remote Transmission before launching main installer
|
||||
# This ensures the TRANSMISSION_REMOTE variable is set correctly
|
||||
echo -e "${BOLD}Transmission Configuration:${NC}"
|
||||
echo -e "Configure connection to your Transmission client:"
|
||||
echo
|
||||
|
||||
read -p "Is Transmission running on a remote server? (y/n) [n]: " input_remote
|
||||
if [[ $input_remote =~ ^[Yy]$ ]]; then
|
||||
export TRANSMISSION_REMOTE=true
|
||||
echo -e "${GREEN}Remote Transmission selected.${NC}"
|
||||
else
|
||||
export TRANSMISSION_REMOTE=false
|
||||
echo -e "${GREEN}Local Transmission selected.${NC}"
|
||||
fi
|
||||
|
||||
# Create a direct environment file for the main installer
|
||||
echo "export TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE" > "${SCRIPT_DIR}/.env.install"
|
||||
chmod +x "${SCRIPT_DIR}/.env.install"
|
||||
|
||||
# Force inclusion in the main installer - modify the main installer temporarily if needed
|
||||
if ! grep -q "source.*\.env\.install" "${SCRIPT_DIR}/main-installer.sh"; then
|
||||
# Backup the main installer
|
||||
cp "${SCRIPT_DIR}/main-installer.sh" "${SCRIPT_DIR}/main-installer.sh.bak"
|
||||
|
||||
# Insert the source command after the shebang line
|
||||
awk 'NR==1{print; print "# Load installation environment variables"; print "if [ -f \"$(dirname \"$0\")/.env.install\" ]; then"; print " source \"$(dirname \"$0\")/.env.install\""; print " echo \"Loaded TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE from environment file\""; print "fi"} NR!=1{print}' "${SCRIPT_DIR}/main-installer.sh.bak" > "${SCRIPT_DIR}/main-installer.sh"
|
||||
chmod +x "${SCRIPT_DIR}/main-installer.sh"
|
||||
fi
|
||||
|
||||
# Now execute the main installer with the environment variables set
|
||||
echo "Running main installer with TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
||||
bash -c "source ${SCRIPT_DIR}/.env.install && ${SCRIPT_DIR}/main-installer.sh"
|
||||
exec "${SCRIPT_DIR}/main-installer.sh"
|
@ -5,32 +5,13 @@ function install_dependencies() {
|
||||
log "INFO" "Installing dependencies..."
|
||||
|
||||
# Make sure TRANSMISSION_REMOTE variable is set
|
||||
# Always prompt if we didn't get TRANSMISSION_REMOTE from environment or previous steps
|
||||
if [ -z "$TRANSMISSION_REMOTE" ]; then
|
||||
log "WARN" "TRANSMISSION_REMOTE variable was not set, asking now..."
|
||||
|
||||
# Directly ask about remote Transmission
|
||||
echo -e "${BOLD}Transmission Configuration:${NC}"
|
||||
echo -e "Configure connection to your Transmission client:"
|
||||
echo
|
||||
|
||||
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
|
||||
|
||||
# Save this choice to environment file for other scripts
|
||||
echo "export TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE" > "$(dirname "$(dirname "$0")")/.env.install"
|
||||
chmod +x "$(dirname "$(dirname "$0")")/.env.install"
|
||||
else
|
||||
log "INFO" "Using previously set TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
||||
# 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" "Proceeding with Transmission mode: $([ "$TRANSMISSION_REMOTE" = true ] && echo "Remote" || echo "Local")"
|
||||
log "INFO" "Transmission mode: $([ "$TRANSMISSION_REMOTE" = true ] && echo "Remote" || echo "Local")"
|
||||
|
||||
# Log transmission mode
|
||||
log "INFO" "Proceeding with Transmission mode: $([ "$TRANSMISSION_REMOTE" = true ] && echo "Remote" || echo "Local")"
|
||||
@ -70,7 +51,6 @@ function install_dependencies() {
|
||||
if [ "$TRANSMISSION_REMOTE" = false ]; then
|
||||
if ! command_exists transmission-daemon; then
|
||||
log "INFO" "Local Transmission installation selected, but transmission-daemon is not installed."
|
||||
log "INFO" "You selected to use a local Transmission installation during configuration."
|
||||
read -p "Would you like to install Transmission now? (y/n): " install_transmission
|
||||
|
||||
if [[ "$install_transmission" =~ ^[Yy]$ ]]; then
|
||||
|
Loading…
x
Reference in New Issue
Block a user