aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xhttracker8
-rw-r--r--lib/httracker/functions11
-rwxr-xr-xscuttler9
3 files changed, 13 insertions, 15 deletions
diff --git a/httracker b/httracker
index 0651be4..cd99f60 100755
--- a/httracker
+++ b/httracker
@@ -3,15 +3,9 @@
# Httrack feed downloader.
#
-# Configuration
-source `dirname $0`/config || exit 1
-
-# Functions
+# Load and initialize
source `dirname $0`/lib/httracker/functions || exit 1
-# Create folders
-httracker_setup_folders
-
# Get URLs from feed
# Thanks http://stackoverflow.com/questions/443991/how-to-parse-rss-feeds-xml-in-a-shell-script
curl -s "$FEED" | grep -o '<link>[^<]*' | grep -o "[^>]*$" > $URLS
diff --git a/lib/httracker/functions b/lib/httracker/functions
index 0885206..8e8964e 100644
--- a/lib/httracker/functions
+++ b/lib/httracker/functions
@@ -107,3 +107,14 @@ function httracker_setup_folders {
chown -R $USER.$GROUP $TMP
fi
}
+
+# Set basic environment
+function httracker_set_env {
+ source `dirname $0`/config || exit 1
+
+ # Create folders
+ httracker_setup_folders
+}
+
+# Initialize
+httracker_set_env
diff --git a/scuttler b/scuttler
index cb49918..1c64622 100755
--- a/scuttler
+++ b/scuttler
@@ -3,17 +3,10 @@
# Download all links from a Semantic Scuttle instance.
#
-# Configuration
-source `dirname $0`/config || exit 1
-
-# Functions
+# Load and initialize
source `dirname $0`/lib/httracker/functions || exit 1
-# Create folders
-httracker_setup_folders
-
# Other parameters
-SCUTTLE_BASE="/var/sites/links"
SCUTTLEDIR="`basename $( find ${SCUTTLE_BASE} -maxdepth 1 -iname "SemanticScuttle-*" | head -n 1 )`"
CONFIGFILE="${SCUTTLE_BASE}/${SCUTTLEDIR}/data/config.php"
DBUSER="`httracker_scuttle_config dbuser`"