Apple-2-Tools/a2cloud
1
0
Fork 0
mirror of https://github.com/RasppleII/a2cloud.git synced 2024-11-29 17:49:30 +00:00
Code Issues Projects Releases Wiki Activity

Change a2cSource to top_src

Browse Source 
I've started working on a2server basically out of necessity and I'm
trying to reduce diffs with a2cloud for basically identical code, so I'm
changing things like a2cSource to top_src, that way I can reuse blocks
of code more easily without stupid "off by one letter" mistakes.
This commit is contained in:
T. Joseph Carter 2018-09-06 13:09:57 -07:00
parent eafb691671
commit 6f75afe092
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
install.sh
View File

@ -16,12 +16,12 @@ if test "x$BASH" = "x"; then
fi
# Find the path of our source directory
a2cSource="$( dirname "${BASH_SOURCE[0]}" )"
pushd $a2cSource >/dev/null
a2cSource="$PWD"
top_src="$( dirname "${BASH_SOURCE[0]}" )"
pushd $top_src >/dev/null
top_src="$PWD"
popd >/dev/null
if [[ ! -f "$a2cSource/.a2cloud_source" ]]; then
printf "\na2cloud: cannot find a2cloud source directory in $a2cSource.\n\n"
if [[ ! -f "$top_src/.a2cloud_source" ]]; then
printf "\na2cloud: cannot find a2cloud source directory in $top_src.\n\n"
exit 1
fi
@ -45,7 +45,7 @@ process_args() {
process_args "$@"
# FIXME: Show version, changes, config, allow reconfig, etc…
"$a2cSource/scripts/show_changes"
"$top_src/scripts/show_changes"
cat <<EOF
Your system will be set up for a2cloud, providing you with
@ -72,13 +72,13 @@ if [[ ! $autoAnswerYes ]]; then
fi
# Fix any mistakes we've made in previous versions
. "$a2cSource/scripts/fixup"
. "$top_src/scripts/fixup"
# Install Archive Tools
# FIXME: Interim refactoring
. "$a2cSource/scripts/install_archive_tools" $noPicoPkg
. "$top_src/scripts/install_archive_tools" $noPicoPkg
# Run the legacy setup script for anything not yet ported
if [[ -e "${a2cSource}/setup/ivan.sh" ]]; then
"${a2cSource}/setup/ivan.sh" "$@"
if [[ -e "${top_src}/setup/ivan.sh" ]]; then
"${top_src}/setup/ivan.sh" "$@"
fi