Skip to content

Commit

Permalink
uninstall -k
Browse files Browse the repository at this point in the history
  • Loading branch information
whitewhidow committed Nov 8, 2020
1 parent d2519c5 commit 325b813
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 5 deletions.
8 changes: 4 additions & 4 deletions install
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,11 @@ fi

echo "Checking adb."
if ! command -v adb &> /dev/null; then
if [ $OSTYPE == "mac" ]; then
if [ "$OSTYPE" == "mac" ]; then
brew cask install android-platform-tools
fi

if [ $OSTYPE == "linux" ]; then
if [ "$OSTYPE" == "linux" ]; then
echo "-> Please wait while we attempt to install missing 'adb' package. (requires sudo)"
sudo apt install android-tools-adb 2> /dev/null
fi
Expand All @@ -140,11 +140,11 @@ fi

echo "Checking aapt."
if ! command -v aapt &> /dev/null; then
if [ $OSTYPE == "linux" ]; then
if [ "$OSTYPE" == "linux" ]; then
echo "-> Please wait while we attempt to install missing 'aapt' package. (requires sudo)"
sudo apt install android-sdk-build-tools
fi
if [ $OSTYPE == "mac" ]; then
if [ "$OSTYPE" == "mac" ]; then
echo "-> Please wait while we attempt to install missing 'aapt' package. (requires sudo)"
curl -s https://raw.githubusercontent.com/whitewhidow/quest-sideloader-linux/main/mac_aapt_lib/aapt -o aapt
#https://dl.androidaapt.com/aapt-macos.zip
Expand Down
8 changes: 7 additions & 1 deletion sideload
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,13 @@ printf "\n"


info "(Re)Installing $PACKAGENAME, (please wait)"
[ -z $CI ] && [ -z $LOCAL ] && $ADB uninstall "$PACKAGENAME" > /dev/null
dialog --title "Remove save and cache data?" --yesno "Should we also clear any possible cache and savedata for this package?" 0 0
if [ "$?" == 0 ]; then
[ -z $CI ] && [ -z $LOCAL ] && $ADB uninstall "$PACKAGENAME" > /dev/null
else
[ -z $CI ] && [ -z $LOCAL ] && $ADB uninstall -k "$PACKAGENAME" > /dev/null
fi

[ -z $CI ] && [ -z $LOCAL ] && $ADB install -g -d "$APKNAME" > /dev/null
ok "(Re)Installed $PACKAGENAME"
#uninstall and install
Expand Down

0 comments on commit 325b813

Please sign in to comment.