fixed the start script

This commit is contained in:
Andrei Yankovich 2020-11-16 15:18:19 +03:00
parent 4a116daac5
commit 751c49d606

View File

@ -8,24 +8,6 @@ export JAVA_HOME="$SNAP/usr/lib/jvm/java-8-openjdk-amd64"
export ANDROID_SDK_HOME="$HOME/.Android"
export _JAVA_OPTIONS=-Duser.home=$HOME
if [ "$(ls -A $OLD_SDK_ROOT)" ]; then
echo "The default sdk folder has been changed from $OLD_SDK_ROOT to $SDK_ROOT ."
echo "The Old location of sdk root have big problems with update the androidsdk package."
echo "For more information about this problem see the https://github.com/QuasarApp/sdkmanager-android/issues/2 issue."
echo ""
if [ ! -d $SDK_ROOT ]
then
mkdir $SDK_ROOT
fi
mv $OLD_SDK_ROOT $EXTERNAL_HOME
ln -s $SDK_ROOT $OLD_SDK_ROOT
echo "All your installed sdk files has been moved to new location."
echo "If you want change a sdk location please use the --sdk_root option."
fi
for var in "$@"
do
if [[ $var == *"--sdk_root"* ]]; then
@ -34,6 +16,40 @@ do
done
if [ -d "$OLD_SDK_ROOT" ] && [ ! -L "$OLD_SDK_ROOT" ] && [ "$(ls -A $OLD_SDK_ROOT)" ]
then
echo "The default sdk folder has been changed from $OLD_SDK_ROOT to $SDK_ROOT ."
echo "The Old location of sdk root have big problems with update the androidsdk package."
echo "For more information about this problem see the https://github.com/QuasarApp/sdkmanager-android/issues/2 issue."
echo ""
if [ ! -d $SDK_ROOT ]
then
mkdir $SDK_ROOT
else
if [ "$(ls -A $SDK_ROOT)" ]; then
echo "The $SDK_ROOT dir is not empty. Please move all data to an another location and run the androdisdk again"
exit 1
else
rm -d $SDK_ROOT
fi
fi
mv $OLD_SDK_ROOT $EXTERNAL_HOME
if [ "$?" = "0" ]; then
echo "All your installed sdk files has been moved to new location."
echo "If you want change a sdk location please use the --sdk_root option."
ln -s $SDK_ROOT $OLD_SDK_ROOT
else
echo "Unknown error occurred."
echo "Please report this issue to us. You can report a problem here:"
echo "https://github.com/QuasarApp/sdkmanager-android/issues/new"
exit $status
fi
fi
echo "SDK_ROOT=$SDK_ROOT"
exec "$SNAP/cmdline-tools/bin/sdkmanager" "--sdk_root=$SDK_ROOT" "$@"