From 9c15c1b6586cbb5518d3c5b3d3466459c3ec521f Mon Sep 17 00:00:00 2001 From: Shane Date: Wed, 14 May 2025 11:01:29 +1000 Subject: [PATCH] remove requirements install --- manage_scripts.sh | 26 ++++++++++++++------------ requirements.txt | 3 +-- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/manage_scripts.sh b/manage_scripts.sh index 8c09e43..bbeb1ca 100755 --- a/manage_scripts.sh +++ b/manage_scripts.sh @@ -65,7 +65,8 @@ run_script() { else log "$script failed with exit code $exit_code" fi - sleep_time=$(tail -n 1 "$script_log" | grep -oP 'sleep_time: \K[0-9]+' || echo $((RANDOM % 601 + 1200))) + # Extract sleep time from the last line containing "sleep_time:" + sleep_time=$(grep "sleep_time:" "$script_log" | tail -n 1 | grep -oP 'sleep_time: \K[0-9]+' || echo $((RANDOM % 601 + 1200))) log "$script completed, sleep_time: $sleep_time seconds" rm -f "$LOCK_DIR/${script_name}.lock" echo "$sleep_time" @@ -100,17 +101,18 @@ update_dependencies() { log "Created new virtual environment" fi source "$BASE_DIR/venv/bin/activate" - "$VENV_PYTHON" -m pip install --upgrade pip - if [ -f "requirements.txt" ]; then - "$VENV_PYTHON" -m pip install -r requirements.txt || { - log "Failed to install requirements.txt, attempting core dependencies" - "$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil - log "Fallback: Installed core dependencies" - } - else - log "Error: requirements.txt not found, installing core dependencies" - "$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil - fi + # Commenting out dependency installation since packages are already installed and working + # "$VENV_PYTHON" -m pip install --upgrade pip + # if [ -f "requirements.txt" ]; then + # "$VENV_PYTHON" -m pip install -r requirements.txt || { + # log "Failed to install requirements.txt, attempting core dependencies" + # "$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil + # log "Fallback: Installed core dependencies" + # } + # else + # log "Error: requirements.txt not found, installing core dependencies" + # "$VENV_PYTHON" -m pip install requests openai beautifulsoup4 feedparser praw duckduckgo_search selenium Pillow pytesseract webdriver-manager tweepy python-dotenv flickr-api filelock requests-oauthlib psutil + # fi log "Dependencies updated." } diff --git a/requirements.txt b/requirements.txt index 8a20c35..f4a8d67 100644 --- a/requirements.txt +++ b/requirements.txt @@ -12,5 +12,4 @@ tweepy==4.15.0 python-dotenv==1.1.0 flickr-api==0.7.7 filelock==3.16.1 -requests-oauthlib==2.0.0 -psutil==7.0.0 \ No newline at end of file +requests-oauthlib==2.0.0 \ No newline at end of file