From c54567b15f65ff7ba88ffa63233491772cb1ba59 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Sun, 22 Mar 2015 16:18:23 +0000
Subject: misc fixes

---
 .gitignore           | 6 ++++--
 apkcontent2sqlite.sh | 9 +++++++--
 apkindex2sqlite.sh   | 9 ++++-----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6f48979..63949f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
-filelist.db
-output.csv
+csv
+db                    
+filelist
+repository
diff --git a/apkcontent2sqlite.sh b/apkcontent2sqlite.sh
index 21d4284..e8d1f96 100755
--- a/apkcontent2sqlite.sh
+++ b/apkcontent2sqlite.sh
@@ -6,7 +6,8 @@ repos="main testing"
 archs="x86 x86_64 armhf"
 db="db/filelist.db"
 csv="csv/filelist.csv"
-turbo_db="/var/www/aports-turbo/db/apkindex.db"
+turbo_db="/var/www/aports-turbo/db/filelist.db"
+rsync="rsync://nl.alpinelinux.org/alpine/edge"
 
 rm_stale_filelist() {
     for repo in $repos; do
@@ -92,8 +93,12 @@ mv_db() {
     mv $db $turbo_db
 }
 
+update_apkindex() {
+    ./apkindex2sqlite.sh
+}
+
 # just do it
 prepare && apk_sync && update_filelist && rm_stale_filelist
 # only update db when we have changes
-[ ! -z "$result" ] && cat_csv && create_db && mv_db
+[ ! -z "$result" ] && cat_csv && create_db && mv_db && update_apkindex
 
diff --git a/apkindex2sqlite.sh b/apkindex2sqlite.sh
index 64e3919..bbceb27 100755
--- a/apkindex2sqlite.sh
+++ b/apkindex2sqlite.sh
@@ -56,16 +56,15 @@ write_db() {
     printf "CREATE INDEX deps on apkindex (deps);" | sqlite3 $db
 }
 
-prepare() {
-    rm -f $db $csv
-    mkdir -p ${csv%/*} ${db%/*}
+mv_db() {
+    mv $db $turbo_db
 }
 
 rm -f $csv
 
 for repo in $repos; do
     for arch in $archs; do
-        rm -f /tmp/APKINDEX
+	rm -f /tmp/APKINDEX
         #curl -s "$aports/$repo/$arch/APKINDEX.tar.gz" | tar -zx -C /tmp APKINDEX
         tar -C /tmp -zxf $packages/$repo/$arch/APKINDEX.tar.gz APKINDEX
         IFS=$'\n'
@@ -80,4 +79,4 @@ for repo in $repos; do
     done
 done
 
-prepare && init_db && write_db
+init_db && write_db && mv_db
-- 
cgit v1.2.3