From 38d2808d9aa03a0a26c77b11d9417cb47ec9b286 Mon Sep 17 00:00:00 2001
From: "T. Joseph Carter" <tjcarter@spiritsubstance.com>
Date: Thu, 10 May 2018 09:39:45 -0700
Subject: [PATCH] Move install_archive_tools to install.sh

Installing archive tools now happens before ivan.sh.  This actually
means that installing archive tools happens before you're asked if you
want to continue.  That'll be the next thing I work on I think.
---
 install.sh    | 4 ++++
 setup/ivan.sh | 4 ----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/install.sh b/install.sh
index 46f7140..6c2d87b 100755
--- a/install.sh
+++ b/install.sh
@@ -38,6 +38,10 @@ process_args "$@"
 # FIXME: Show version, changes, config, allow reconfig, etc…
 "$a2cSource/scripts/show_changes"
 
+# Install Archive Tools
+# FIXME: Interim refactoring
+. "$a2cSource/scripts/install_archive_tools" ${noPicoPkg:+-c}
+
 # Run the legacy setup script for anything not yet ported
 if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then
 	"${a2cSource}/setup/ivan.sh" "$@"
diff --git a/setup/ivan.sh b/setup/ivan.sh
index 9dc8556..a8dab89 100755
--- a/setup/ivan.sh
+++ b/setup/ivan.sh
@@ -655,10 +655,6 @@ fi
 # FIXME: Interim refactoring
 . "$a2cSource/scripts/install_emulators" ${noPicoPkg:+-c} ${slot6:+-6}
 
-# Install Archive Tools
-# FIXME: Interim refactoring
-. "$a2cSource/scripts/install_archive_tools" ${noPicoPkg:+-c}
-
 # add shortcuts to LXDE desktop
 if [[ -f /usr/bin/X ]]; then