Modularizing

1 files changed, 7 insertions, 16 deletions

diff --git a/scuttler b/scuttler
index be0cabc..dbfe025 100755
--- a/scuttler
+++ b/scuttler
@@ -9,6 +9,9 @@ CONFIGFILE=${BASEDIR}/${SCUTTLEDIR}/data/config.php
 MIRRORDIR=${BASEDIR}/mirrors
 TMPDIR=/tmp
 
+# Load functions
+source lib/httracker/functions || exit 1
+
 getconf() {
   grep ${1} ${CONFIGFILE} | sed -e s/\[^\'\]\*\'// -e s/\'\.\*\$//
 }
@@ -33,19 +36,7 @@ chown links.links ${tmpfile}
 chmod 600 ${tmpfile}
 sqlquery "select bAddress from sc_bookmarks;" > ${tmpfile}
 
-# creates target dir
-year=`date +%Y`
-month=`date +%m`
-%day=`date +%d`
-TARGETDIR=${MIRRORDIR}/${year}/${month}
-sudo -u links mkdir -p ${TARGETDIR}
-
-# grabs URLs from the network
-httrack --verbose           \
-        --user links        \
-        --depth=1           \
-        --purge-old=0       \
-        --index             \
-        --cookies=1         \
-        --list ${tmpfile}   \
-        --path ${TARGETDIR} \
+httracker_target_single
+httracker_get_single
+
+rm ${tmpfile}