masterdraco/transmission-rss-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: masterdraco:1d9996202483eecabbf5f1c2a5cc753ae6732375
Branches Tags
masterdraco:main
masterdraco:feature/improved-transmission-connection
..
compare: masterdraco:b54086cfd09852826494724d59af27668092f521
Branches Tags
masterdraco:feature/improved-transmission-connection
masterdraco:main

No commits in common. "1d9996202483eecabbf5f1c2a5cc753ae6732375" and "b54086cfd09852826494724d59af27668092f521" have entirely different histories.
1d99962024 ... b54086cfd0

3 changed files with 6 additions and 28 deletions
Show Stats Expand all files Collapse all files

9
install-script.sh
View File

@ -1174,8 +1174,7 @@ echo -e "Configure connection to your Transmission client:"
echo
read -p "Is Transmission running on a remote server? (y/n) [n]: " input_remote
# Explicitly check for "y" or "Y" response
if [[ "$input_remote" == "y" ]] || [[ "$input_remote" == "Y" ]]; then
if [[ $input_remote =~ ^[Yy]$ ]]; then
export TRANSMISSION_REMOTE=true
echo -e "${GREEN}Remote Transmission selected.${NC}"
else
@ -1187,9 +1186,6 @@ fi
echo "export TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE" > "${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
if ! grep -q "source.*\.env\.install" "${SCRIPT_DIR}/main-installer.sh"; then
# Backup the main installer
@ -1202,5 +1198,4 @@ fi
# Now execute the main installer with the environment variables set
echo "Running main installer with TRANSMISSION_REMOTE=$TRANSMISSION_REMOTE"
export TRANSMISSION_REMOTE
"${SCRIPT_DIR}/main-installer.sh"
bash -c "source ${SCRIPT_DIR}/.env.install && ${SCRIPT_DIR}/main-installer.sh"

6
main-installer.sh
View File

@ -5,12 +5,6 @@
# Set script to exit on error
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
BOLD='\033[1m'
GREEN='\033[0;32m'

19
modules/dependencies-module.sh
View File

@ -4,21 +4,7 @@
function install_dependencies() {
log "INFO" "Installing dependencies..."
# Make sure TRANSMISSION_REMOTE variable is set and honored
# 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
# 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..."
@ -45,6 +31,9 @@ function install_dependencies() {
fi
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
if command -v apt-get &> /dev/null; then