Skip to content

Commit

Permalink
Update common.sh
Browse files Browse the repository at this point in the history
  • Loading branch information
ale5000-git authored Oct 17, 2024
1 parent 901219e commit 0df0289
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions includes/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1251,12 +1251,12 @@ fi

# Set environment variables
UTILS_DIR="${MAIN_DIR:?}/utils"
echo "${UTILS_DIR:?}"
echo "1: ${UTILS_DIR:?}"
UTILS_DATA_DIR="${UTILS_DIR:?}/data"
readonly UTILS_DIR UTILS_DATA_DIR
echo "${UTILS_DIR:?}"
echo "2: ${UTILS_DIR:?}"
export UTILS_DIR UTILS_DATA_DIR
echo "${UTILS_DIR:?}"
echo "3: ${UTILS_DIR:?}"

# Set the path of Android SDK if not already set
if test -z "${ANDROID_SDK_ROOT-}"; then
Expand All @@ -1272,7 +1272,7 @@ echo "${UTILS_DIR:?}"
fi
fi

echo "${UTILS_DIR:?}"
echo "4: ${UTILS_DIR:?}"
if test -n "${ANDROID_SDK_ROOT-}"; then
if test -n "${CYGPATH?}"; then
# Only on Bash under Windows
Expand All @@ -1294,12 +1294,12 @@ echo "${UTILS_DIR:?}"
fi
fi

echo "${UTILS_DIR:?}"
echo "5: ${UTILS_DIR:?}"
if test "${PLATFORM:?}" = 'win'; then
export BB_OVERRIDE_APPLETS='; make'
fi

echo "${UTILS_DIR:?}"
echo "6: ${UTILS_DIR:?}"
if command 1> /dev/null 2>&1 -v 'alias'; then
alias 'dir'='ls'
alias 'cd..'='cd ..'
Expand All @@ -1311,26 +1311,26 @@ echo "${UTILS_DIR:?}"
fi
alias 'clear-prev'="printf '\033[A\33[2K\033[A\33[2K\r'"

echo "${UTILS_DIR:?}"
echo "7: ${UTILS_DIR:?}"
if test -f "${MAIN_DIR:?}/includes/custom-aliases.sh"; then
# shellcheck source=/dev/null
. "${MAIN_DIR:?}/includes/custom-aliases.sh" || ui_error 'Unable to source includes/custom-aliases.sh'
fi

echo "${UTILS_DIR:?}"
echo "8: ${UTILS_DIR:?}"
alias 'build'='build.sh'
alias 'cmdline'='cmdline.sh'
if test "${PLATFORM:?}" = 'win'; then
alias 'gradlew'='gradlew.bat'
alias 'start'='start.sh'
fi

echo "${UTILS_DIR:?}"
echo "9: ${UTILS_DIR:?}"
alias 'bits-info'="bits-info.sh"
alias 'help'='help.sh'
fi

echo "${UTILS_DIR:?}"
echo "10: ${UTILS_DIR:?}"
add_to_path_env "${UTILS_DIR:?}"
add_to_path_env "${MAIN_DIR:?}"
PATH="%builtin${PATHSEP:?}${PATH-}"
Expand Down

0 comments on commit 0df0289

Please sign in to comment.