From: Silvio Rhatto <rhatto@riseup.net>
Date: Sun, 25 Aug 2013 23:02:27 +0000 (-0300)
Subject: Cleanup
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=9b776add4b73348db605dc988ba99f83d281cdbd;p=httruta.git

Cleanup
---

diff --git a/httracker b/httracker
index 385035c..5967e4a 100755
--- a/httracker
+++ b/httracker
@@ -6,13 +6,13 @@
 # Configuration
 source config || exit 1
 
-# Load functions
+# Functions
 source lib/httracker/functions || exit 1
 
 # Create folders
 mkdir -p $MIRRORS $TMP
 
-# Get URL
+# 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/scuttler b/scuttler
index 0b2b6da..c02e992 100755
--- a/scuttler
+++ b/scuttler
@@ -6,20 +6,19 @@
 # Configuration
 source config || exit 1
 
+# Functions
+source lib/httracker/functions || exit 1
+
 # Other parameters
 BASEDIR=/var/sites/links
 SCUTTLEDIR=`basename $( find ${BASEDIR} -maxdepth 1 -iname "SemanticScuttle-*" | head -n 1 )`
 CONFIGFILE=${BASEDIR}/${SCUTTLEDIR}/data/config.php
-
-# Load functions
-source lib/httracker/functions || exit 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
+# Get URLs from database
 URLS=`mktemp -p ${TMP}`
 chown links.links ${URLS}
 chmod 600 ${URLS}