From a83dd79e81c1a76e79ea9edc6879e7519c115821 Mon Sep 17 00:00:00 2001
From: Automatic Release Builder <build@flightgear.org>
Date: Wed, 9 Jun 2021 14:04:07 +0100
Subject: [PATCH] Fix base package creation script

Ensure the scenery pack is extracted correctly
---
 release_builder/create_base_package.sh | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/release_builder/create_base_package.sh b/release_builder/create_base_package.sh
index 6a52ba2..3f51b29 100755
--- a/release_builder/create_base_package.sh
+++ b/release_builder/create_base_package.sh
@@ -39,14 +39,13 @@ SCENERY_PACK_NAME=SceneryPack_${SCENERY_PACK_AIRPORT}.tgz
 
 # Should we re-download the SceneryPack periodically? Or just rely on doing a workspace wipe?
 if [ ! -f $SCENERY_PACK_NAME ]; then
-    echo "Downlaod scenery pack from ${SCENERY_PACK_URI}"
+    echo "Downloading scenery pack from ${SCENERY_PACK_URI}"
     # -L to follow the SF redirect
     curl -L $SCENERY_PACK_URI --output $SCENERY_PACK_NAME
 fi
 
-tar -xf $SCENERY_PACK_NAME --directory staging/fgdata
-pushd staging/fgdata
-mv SceneryPack.${SCENERY_PACK_AIRPORT} Scenery
+pushd staging/fgdata/Scenery
+tar -xf $WORKSPACE/$SCENERY_PACK_NAME --strip-components=1
 popd
 
 # Creating full base package TXZ