Compare commits
No commits in common. "1d9996202483eecabbf5f1c2a5cc753ae6732375" and "b54086cfd09852826494724d59af27668092f521" have entirely different histories.
1d99962024
...
b54086cfd0
@ -1174,8 +1174,7 @@ echo -e "Configure connection to your Transmission client:"
|
|||||||
echo
|
echo
|
||||||
|
|
||||||
read -p "Is Transmission running on a remote server? (y/n) [n]: " input_remote
|
read -p "Is Transmission running on a remote server? (y/n) [n]: " input_remote
|
||||||
# Explicitly check for "y" or "Y" response
|
if [[ $input_remote =~ ^[Yy]$ ]]; then
|
||||||
if [[ "$input_remote" == "y" ]] || [[ "$input_remote" == "Y" ]]; then
|
|
||||||
export TRANSMISSION_REMOTE=true
|
export TRANSMISSION_REMOTE=true
|
||||||
echo -e "${GREEN}Remote Transmission selected.${NC}"
|
echo -e "${GREEN}Remote Transmission selected.${NC}"
|
||||||
else
|
else
|
||||||
@ -1187,9 +1186,6 @@ fi
|
|||||||
echo "export TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE" > "${SCRIPT_DIR}/.env.install"
|
echo "export TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE" > "${SCRIPT_DIR}/.env.install"
|
||||||
chmod +x "${SCRIPT_DIR}/.env.install"
|
chmod +x "${SCRIPT_DIR}/.env.install"
|
||||||
|
|
||||||
# Ensure the environment file is world-readable to avoid permission issues
|
|
||||||
chmod 644 "${SCRIPT_DIR}/.env.install"
|
|
||||||
|
|
||||||
# Force inclusion in the main installer - modify the main installer temporarily if needed
|
# 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
|
if ! grep -q "source.*\.env\.install" "${SCRIPT_DIR}/main-installer.sh"; then
|
||||||
# Backup the main installer
|
# Backup the main installer
|
||||||
@ -1202,5 +1198,4 @@ fi
|
|||||||
|
|
||||||
# Now execute the main installer with the environment variables set
|
# Now execute the main installer with the environment variables set
|
||||||
echo "Running main installer with TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
echo "Running main installer with TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
||||||
export TRANSMISSION_REMOTE
|
bash -c "source ${SCRIPT_DIR}/.env.install && ${SCRIPT_DIR}/main-installer.sh"
|
||||||
"${SCRIPT_DIR}/main-installer.sh"
|
|
@ -5,12 +5,6 @@
|
|||||||
# Set script to exit on error
|
# Set script to exit on error
|
||||||
set -e
|
set -e
|
||||||
|
|
||||||
# Load installation environment variables if they exist
|
|
||||||
if [ -f "$(dirname "$0")/.env.install" ]; then
|
|
||||||
source "$(dirname "$0")/.env.install"
|
|
||||||
echo "Loaded TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE from environment file"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Text formatting
|
# Text formatting
|
||||||
BOLD='\033[1m'
|
BOLD='\033[1m'
|
||||||
GREEN='\033[0;32m'
|
GREEN='\033[0;32m'
|
||||||
|
@ -4,21 +4,7 @@
|
|||||||
function install_dependencies() {
|
function install_dependencies() {
|
||||||
log "INFO" "Installing dependencies..."
|
log "INFO" "Installing dependencies..."
|
||||||
|
|
||||||
# Make sure TRANSMISSION_REMOTE variable is set and honored
|
# Make sure TRANSMISSION_REMOTE variable is set
|
||||||
# First check for environment variable that might have been directly set
|
|
||||||
# Then check the .env.install file in various locations
|
|
||||||
|
|
||||||
# Try relative path first
|
|
||||||
ENV_FILE="$(dirname "$(dirname "$0")")/.env.install"
|
|
||||||
if [ -f "$ENV_FILE" ]; then
|
|
||||||
source "$ENV_FILE"
|
|
||||||
log "INFO" "Loaded transmission settings from environment file: TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
|
||||||
# Try absolute path as fallback
|
|
||||||
elif [ -f "/opt/develop/transmission-rss-manager/.env.install" ]; then
|
|
||||||
source "/opt/develop/transmission-rss-manager/.env.install"
|
|
||||||
log "INFO" "Loaded transmission settings from absolute path: TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Always prompt if we didn't get TRANSMISSION_REMOTE from environment or previous steps
|
# Always prompt if we didn't get TRANSMISSION_REMOTE from environment or previous steps
|
||||||
if [ -z "$TRANSMISSION_REMOTE" ]; then
|
if [ -z "$TRANSMISSION_REMOTE" ]; then
|
||||||
log "WARN" "TRANSMISSION_REMOTE variable was not set, asking now..."
|
log "WARN" "TRANSMISSION_REMOTE variable was not set, asking now..."
|
||||||
@ -46,6 +32,9 @@ function install_dependencies() {
|
|||||||
|
|
||||||
log "INFO" "Proceeding with Transmission mode: $([ "$TRANSMISSION_REMOTE" = true ] && echo "Remote" || echo "Local")"
|
log "INFO" "Proceeding with 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")"
|
||||||
|
|
||||||
# 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