@@ -2,7 +2,7 @@

 fgaddon_url=https://sourceforge.net/p/flightgear/fgaddon/HEAD/tree/trunk/Aircraft

 fgaddon_svn=https://svn.code.sf.net/p/flightgear/fgaddon/trunk/Aircraft

-fgaddon_path=$HOME/.fgfs/flightgear-addons/Aircraft

+fgaddon_path=$HOME/.fgfs/flightgear-fgaddon/Aircraft

 aircrafts=$(mktemp --dry-run /dev/shm/Aircraft-XXXXXXXXX)

 aircraft=$(mktemp --dry-run /dev/shm/aircraft-XXXXXXX)

@@ -10,7 +10,7 @@ setxml=$(mktemp --dry-run /dev/shm/setxml-XXXXXXXX)

 in_ram_database=$(mktemp --dry-run /dev/shm/XXXXXXX)

 database=${DB:-$0.db}

-attributes=(description long_description author flight_model type)

+attributes=(description long-description author flight-model type)

 xmlgetnext () {

    local IFS='>'

@@ -24,11 +24,27 @@ function sqlite_request () {

 function trap_exit () {

     echo "updating installation status"

-    for ac in $(sqlite_request 'select printf("%i:%s/%s", aircrafts.id, aircrafts.name, setxml.file) from aircrafts inner join setxml where aircrafts.id = setxml.variantof;'); do

+    for ac in $(sqlite_request 'select printf("%i:%s/%s", aircrafts.id, aircrafts.name, setxml.file) from aircrafts inner join setxml where aircrafts.id = setxml.variantof and setxml.installed != 0;'); do

         ac_path=${ac#*:}

-        test ! -e $fgaddon_path/$ac_path-set.xml

-        installed=$?

-        sqlite_request "update setxml set installed = $installed where file = '${ac_path#*/}' and variantof = ${ac%:*}"

+        if test ! -e $fgaddon_path/$ac_path-set.xml; then

+            sqlite_request "update setxml set installed = 0 where file = '${ac_path#*/}' and variantof = ${ac%:*}"

+        fi

+    done

+    for ac in $fgaddon_path/*/*-set.xml; do

+        ac=${ac/$fgaddon_path}

+        sx=${ac##*/}

+        ac=${ac%/*}

+        if test -d $fgaddon_path/$ac/.svn; then

+            install_type=1

+        elif test -d $fgaddon_path/$ac/.git; then

+            install_type=2

+        else

+            install_type=3

+        fi

+        sqlite_request "update setxml set installed = $install_type

+                        where exists (

+                            select 1 from aircrafts where name = '${ac/\/}' and setxml.variantof = id

+                        )"

     done

     if test -r "$database" && md5sum $in_ram_database | sed "s,$in_ram_database,$database," | md5sum --status -c -; then

         rm -f $in_ram_database

@@ -71,20 +87,26 @@ update_database () {

         echo " -> $sx"

         svn export --quiet --force --revision ${revision[$ac]} $fgaddon_svn/$ac/$sx-set.xml $setxml

         while xmlgetnext; do

-            case "$TAG" in

-                ${attributes_case:0:${#attributes_case}-1})

-                    test -n "$in_sim" && eval "${TAG//-/_}=\"$VALUE\""

-                    test -n "$description" \

-                      -a -n "$long_description" \

-                      -a -n "$author" \

-                      -a -n "$flight_model" \

-                      -a -n "$type" && break

-                ;;

-                'sim') in_sim=1;;

-                '/sim') break;;

-            esac

+            if [[ "$TAG" = @($attributes_case) ]]; then

+                test -n "$in_sim" && eval "${TAG//-/_}=\"$VALUE\""

+                test -n "$description" \

+                  -a -n "$long_description" \

+                  -a -n "$author" \

+                  -a -n "$flight_model" \

+                  -a -n "$type" && break

+            elif test "$TAG" = 'sim'; then

+                in_sim=1

+            elif test "$TAG" = '/sim'; then

+                break

+            fi

         done < $setxml

+        test -z "$description" \

+          -a -z "$long_description" \

+          -a -z "$author" \

+          -a -z "$flight_model" \

+          -a -z "$type" && echo "WARNING: no info found, skipping" && continue

+

         if test -n "$description" -a -z "$flight_model"; then

             grep -qi 'jsbsim' <<< "$description" && flight_model='jsb'

             grep -qi 'yasim' <<< "$description" && flight_model='yasim'

@@ -99,14 +121,12 @@ update_database () {

             for attribute in ${attributes[@]}; do

                 dbvalue=$(sqlite_request "select $attribute from setxml where file is '$sx'")

                 eval "wgvalue=\$$attribute"

-                if test "$dbvalue" != "$wgvalue"; then

+                if test "$dbvalue" != "$wgvalue" -a -n "$wgvalue"; then

                     sqlite_request "update setxml set $attribute = '$wgvalue' where file is '$sx'"

                 fi

             done

         else

-            test ! -e $fgaddon_path/$ac/$sx-set.xml

-            installed=$?

-            sqlite_request "insert into setxml values ('$sx', $id, '$description', '$long_description', '$author', '$type', '$flight_model', $installed)"

+            sqlite_request "insert into setxml values ('$sx', $id, '$description', '$long_description', '$author', '$type', '$flight_model', 0)"

         fi

     done

 }

@@ -118,7 +138,8 @@ test -e $database && cp $database $in_ram_database

 sqlite_request "create table if not exists aircrafts (id integer primary key, name text, revision integer, date integer, author text)"

 sqlite_request "create table if not exists setxml (file text, variantof integer, description text, long_description text, author text, type text, flight_model text, installed integer)"

-attributes_case=$(printf "'%s'|" "${attributes[@]}")

+attributes_case=$(printf "%s|" "${attributes[@]}")

+attributes_case=${attributes_case:0:-1}

 latest_revision=$(sqlite_request "select max(revision) from aircrafts")

 echo "downloading FGADDON history from revision ${latest_revision:-0}"

@@ -173,6 +194,11 @@ while xmlgetnext; do

             declare -A _sx

             for ac in "${!revision[@]}"; do

                 update_database

+                if test -d $fgaddon_path/$ac/.svn \

+                && test "$(svn info --show-item=url $fgaddon_path/$ac)" != "$fgaddon_svn/$ac" \

+                || test -d $fgaddon_path/$ac -a ! -d $fgaddon_path/$ac/.svn; then

+                    echo "INFO: local $ac installed out from repo" >&2

+                fi

             done

             break

         ;;