Apple-2-Tools/a2cloud
1
0
Fork 0
mirror of https://github.com/RasppleII/a2cloud.git synced 2024-12-21 22:29:24 +00:00
Code Issues Projects Releases Wiki Activity

Move install_archive_tools to install.sh

Browse Source 
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.
This commit is contained in:
T. Joseph Carter 2018-05-10 09:39:45 -07:00
parent c7818ab379
commit 38d2808d9a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install.sh
View File

@ -38,6 +38,10 @@ process_args "$@"
# FIXME: Show version, changes, config, allow reconfig, etc… # FIXME: Show version, changes, config, allow reconfig, etc…
"$a2cSource/scripts/show_changes" "$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 # Run the legacy setup script for anything not yet ported
if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then
"${a2cSource}/setup/ivan.sh" "$@" "${a2cSource}/setup/ivan.sh" "$@"

4
setup/ivan.sh
View File

@ -655,10 +655,6 @@ fi
# FIXME: Interim refactoring # FIXME: Interim refactoring
. "$a2cSource/scripts/install_emulators" ${noPicoPkg:+-c} ${slot6:+-6} . "$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 # add shortcuts to LXDE desktop
if [[ -f /usr/bin/X ]]; then if [[ -f /usr/bin/X ]]; then