From 5fc4942031a22e7179979679ac3c5ad1fbdfbc28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20Grubbstr=C3=B6m=20=28Grubba=29?=
 <grubba@grubba.org>
Date: Tue, 5 Jul 2016 11:55:09 +0200
Subject: [PATCH] mkpackage: Reorder the contents somewhat.

Make sure that the $EXTRA_PLATFORM_TEST file (if any) comes after
the install script in the generated tar file, so that it becomes
part of $CONTENTS when the installer is executed.

Fixes issue where the $EXTRA_PLATFORM_TEST file wasn't extracted.

Fixes [bug 7740] some more.
---
 bin/mkpackage.pike | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/mkpackage.pike b/bin/mkpackage.pike
index 9a4354097a..770739f931 100644
--- a/bin/mkpackage.pike
+++ b/bin/mkpackage.pike
@@ -276,12 +276,12 @@ class Package
 			      bootstrap,
 			      setup_filename }))->wait();
 
-    packages = ({ install_filename, pike_filename }) + packages;
-
     if (extra_platform_test) {
       packages = ({ extra_platform_test }) + packages;
     }
     
+    packages = ({ install_filename, pike_filename }) + packages;
+
     string original_wd = getcwd();
     foreach(packages, string package)
     {
-- 
GitLab