@@ -28,7 +28,7 @@ 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

         ac_path=${ac#*:}

-        test ! -e $fgaddon_path/$ac_path

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

         installed=$?

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

     done

@@ -61,9 +61,9 @@ update_database () {

     id=$(sqlite_request "select id from aircrafts where name is '$ac'")

     wget -qO- $fgaddon_url/$ac > $aircraft

-    for sx in $(sed -rn 's/<a class="icon" href="(.+-set.xml)" title=".+"><i class="fa fa-file-o">.+$/\1/p' $aircraft); do

-        echo " -> ${sx/-set.xml}"

-        wget -qO- $fgaddon_url/$ac/$sx > $setxml

+    for sx in $(sed -rn 's/<a class="icon" href="(.+)-set.xml" title=".+"><i class="fa fa-file-o">.+$/\1/p' $aircraft); do

+        echo " -> $sx"

+        wget -qO- $fgaddon_url/$ac/$sx-set.xml > $setxml

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

             get_attribute $attribute

         done

@@ -83,7 +83,7 @@ update_database () {

                 fi

             done

         else

-            test ! -e $fgaddon_path/$ac/$sx

+            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)"

         fi

@@ -156,7 +156,7 @@ function fgfs () {

 ############ APPAREIL DANS FGADDON ?

             elif which sqlite3 > /dev/null 2>&1 \

             && test -r $FGADDON/fgaddon.db \

-            && test $(sqlite3 $FGADDON/fgaddon.db <<< "select count(file) from setxml where file is '${fgfs_arg}-set.xml'") -eq 1; then

+            && test $(sqlite3 $FGADDON/fgaddon.db <<< "select count(file) from setxml where file is '${fgfs_arg}'") -eq 1; then

                 model=$(sqlite3 $FGADDON/fgaddon.db <<< "select name from aircrafts inner join setxml on aircrafts.id = setxml.variantof where setxml.file is '${fgfs_arg}-set.xml'")

                 read -q "REPLY?download $model ? (y/N) "

                 read