1 files changed, 5 insertions, 18 deletions
diff --git a/scuttler b/scuttler
index 6d67e5f..d846d87 100755
--- a/scuttler
+++ b/scuttler
@@ -14,29 +14,16 @@ CONFIGFILE=${BASEDIR}/${SCUTTLEDIR}/data/config.php
 # Load functions
 source lib/httracker/functions || exit 1
 
-getconf() {
-  grep ${1} ${CONFIGFILE} | sed -e s/\[^\'\]\*\'// -e s/\'\.\*\$//
-}
-
-dbuser=`getconf dbuser`
-dbpass=`getconf dbpass`
-dbname=`getconf dbname`
-dbhost=`getconf dbhost`
-
-sqlquery() {
-  mysql --skip-column-names --batch \
-        --user=${dbuser}          \
-        --password=${dbpass}      \
-        --database=${dbname}      \
-        --host=${dbhost}          \
-        --execute="${1}"
-}
+dbuser=`httracker_scuttle_config dbuser`
+dbpass=`httracker_scuttle_config dbpass`
+dbname=`httracker_scuttle_config dbname`
+dbhost=`httracker_scuttle_config dbhost`
 
 # Grab URLs from db
 URLS=`mktemp -p ${TMP}`
 chown links.links ${URLS}
 chmod 600 ${URLS}
-sqlquery "select bAddress from sc_bookmarks;" > ${URLS}
+httracker_sqlquery "select bAddress from sc_bookmarks;" > ${URLS}
 
 # Prepare and download
 httracker_target_single