diff options
| -rwxr-xr-x | apkcontent2sqlite.sh | 16 | ||||
| -rwxr-xr-x | apkindex2sqlite.sh | 11 |
2 files changed, 16 insertions, 11 deletions
diff --git a/apkcontent2sqlite.sh b/apkcontent2sqlite.sh index e8d1f96..4efdb80 100755 --- a/apkcontent2sqlite.sh +++ b/apkcontent2sqlite.sh @@ -1,11 +1,13 @@ #!/bin/sh -packages="repository" -filelist="filelist" +path=$(readlink -f $0) +path=$(dirname $path) +packages="$path/repository" +filelist="$path/filelist" repos="main testing" archs="x86 x86_64 armhf" -db="db/filelist.db" -csv="csv/filelist.csv" +db="$path/db/filelist.db" +csv="$path/csv/filelist.csv" turbo_db="/var/www/aports-turbo/db/filelist.db" rsync="rsync://nl.alpinelinux.org/alpine/edge" @@ -32,7 +34,9 @@ update_filelist() { local file="${apk##*/}" if [ ! -e "$filelist/$repo/$arch/${file}.csv" ]; then create_apk_csv "$apk" "$repo" "$arch" >> \ - "$filelist/$repo/$arch/${file}.csv" + "$filelist/$repo/$arch/${file}.csv.tmp" + mv "$filelist/$repo/$arch/${file}.csv.tmp" \ + "$filelist/$repo/$arch/${file}.csv" result=1 fi done @@ -94,7 +98,7 @@ mv_db() { } update_apkindex() { - ./apkindex2sqlite.sh + $path/apkindex2sqlite.sh } # just do it diff --git a/apkindex2sqlite.sh b/apkindex2sqlite.sh index bbceb27..c865a03 100755 --- a/apkindex2sqlite.sh +++ b/apkindex2sqlite.sh @@ -1,10 +1,12 @@ #!/bin/sh -packages="repository" +path=$(readlink -f $0) +path=$(dirname $path) +packages="$path/repository" repos="main testing" archs="x86 x86_64 armhf" -db="db/apkindex.db" -csv="csv/apkindex.csv" +db="$path/db/apkindex.db" +csv="$path/csv/apkindex.csv" turbo_db="/var/www/aports-turbo/db/apkindex.db" read_line() { @@ -64,8 +66,7 @@ rm -f $csv for repo in $repos; do for arch in $archs; do - rm -f /tmp/APKINDEX - #curl -s "$aports/$repo/$arch/APKINDEX.tar.gz" | tar -zx -C /tmp APKINDEX + rm -f /tmp/APKINDEX tar -C /tmp -zxf $packages/$repo/$arch/APKINDEX.tar.gz APKINDEX IFS=$'\n' while read line; do |