From 7e6cd6680d5676e9f26c13cc1f8a7c50f970f3c1 Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Aug 10 2020 21:22:14 +0000
Subject: scripts/countme-update-*.sh - clean up paths


We're going to default to `/var/lib/countme` for the internal/raw data,
and since `setup.py` installs `parse-access-log.py` and `countme-totals.py`
as scripts (typically to `/usr/local/bin`) they should be in `$PATH` -
so fix the default paths we have for them

---

diff --git a/scripts/countme-update-rawdb.sh b/scripts/countme-update-rawdb.sh
index 62e0662..f483769 100755
--- a/scripts/countme-update-rawdb.sh
+++ b/scripts/countme-update-rawdb.sh
@@ -12,9 +12,9 @@ LOG_JITTER_WINDOW=600        # A safe window for out-of-order log entries
 
 PARSECMD="parse-access-log.py"
 STATS_MOUNT="/mnt/fedora_stats"
-STATS_DIR="$STATS_MOUNT/data/countme"
+OUTPUT_DIR="/var/lib/countme"
 
-DEFAULT_RAWDB="$STATS_DIR/raw.db"
+DEFAULT_RAWDB="/var/lib/countme/raw.db"
 DEFAULT_LOGDIR="$STATS_MOUNT/combined-http"
 DEFAULT_LOGFMT="%Y/%m/%d/mirrors.fedoraproject.org-access.log"
 
diff --git a/scripts/countme-update-totals.sh b/scripts/countme-update-totals.sh
index 404683f..9fa4ded 100755
--- a/scripts/countme-update-totals.sh
+++ b/scripts/countme-update-totals.sh
@@ -7,13 +7,11 @@
 
 # Constants and paths
 COUNTCMD="countme-totals.py"
-STATS_MOUNT="/mnt/fedora_stats"
-STATS_DIR="$STATS_MOUNT/data/countme"
 OUTPUT_DIR="/var/lib/countme"
 
-DEFAULT_RAWDB="$STATS_DIR/raw.db"
-DEFAULT_TOTALSDB="$OUTPUT_DIR/countme-totals.db"
-DEFAULT_TOTALSCSV="$OUTPUT_DIR/countme-totals.csv"
+DEFAULT_RAWDB="$OUTPUT_DIR/raw.db"
+DEFAULT_TOTALSDB="$OUTPUT_DIR/totals.db"
+DEFAULT_TOTALSCSV="$OUTPUT_DIR/totals.csv"
 
 ###
 ### Option defaults and CLI parsing code