| ... | ... |
@@ -50,8 +50,6 @@ function fgfs () {
|
| 50 | 50 |
elif test -d $fgfs_source/${component}/.svn; then
|
| 51 | 51 |
local branch=${${(s:/:)$(svn info --show-item relative-url $fgfs_source/$component)}[2]}
|
| 52 | 52 |
fi |
| 53 |
- title="*** ${component:u}${branch:+ [$branch]} ***"
|
|
| 54 |
- printf "\n%s\n%s\n%s\n" "${(l:${#title}::*:)}" "$title" "${(l:${#title}::*:)}"
|
|
| 55 | 53 |
|
| 56 | 54 |
# TODO: prendre en compte les cas sans cmake |
| 57 | 55 |
if test -r $fgfs_source/$component/CMakeLists.txt; then |
| ... | ... |
@@ -63,6 +61,8 @@ function fgfs () {
|
| 63 | 61 |
fi |
| 64 | 62 |
cmake_options+=("-j$simultaneous")
|
| 65 | 63 |
|
| 64 |
+ title="*** ${component:u}${branch:+ [$branch]} ***"
|
|
| 65 |
+ printf "\n%s\n%s\n%s\n" "${(l:${#title}::*:)}" "$title" "${(l:${#title}::*:)}"
|
|
| 66 | 66 |
mkdir -p $fgfs_build/$component |
| 67 | 67 |
cd $fgfs_build/$component |
| 68 | 68 |
|
| ... | ... |
@@ -256,7 +256,24 @@ function fgfs () {
|
| 256 | 256 |
;; |
| 257 | 257 |
--search) |
| 258 | 258 |
command -v sqlite3 > /dev/null || return |
| 259 |
- sqlite3 $FGADDON/fgaddon.db <<< "select printf('%s (%s): %s', file, \`/sim/flight-model\`, \`/sim/description\`) from setxml where file like '%$2%'"
|
|
| 259 |
+ sqlite3 $FGADDON/fgaddon.db <<< "select printf('[%s, %s] %s (%s): %s ',
|
|
| 260 |
+ hangars.name, |
|
| 261 |
+ date(aircrafts.date, 'unixepoch'), |
|
| 262 |
+ setxml.file, |
|
| 263 |
+ setxml.\`/sim/flight-model\`, |
|
| 264 |
+ setxml.\`/sim/description\`) |
|
| 265 |
+ from setxml |
|
| 266 |
+ inner join aircrafts, hangars |
|
| 267 |
+ where |
|
| 268 |
+ aircrafts.hangar = hangars.id |
|
| 269 |
+ and |
|
| 270 |
+ setxml.variantof = aircrafts.id |
|
| 271 |
+ and ( |
|
| 272 |
+ setxml.file like '%$2%' |
|
| 273 |
+ or |
|
| 274 |
+ aircrafts.name like '%$2%' |
|
| 275 |
+ ) |
|
| 276 |
+ order by aircrafts.date desc" |
|
| 260 | 277 |
return |
| 261 | 278 |
;; |
| 262 | 279 |
--mp-list) |