Skip to content

Commit f52d99b

Browse files
Fix OS detection ambiguity
1 parent 1ea7c57 commit f52d99b

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

Variscite.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -340,7 +340,6 @@ showHelp () {
340340
}
341341
### End of functions
342342

343-
344343
### Start code
345344
## Make Variscite stop execution on jailbroken iOS
346345
## Why? I don't know how to handle rootless, as this was only tested on rootfull and fakefs.
@@ -439,7 +438,10 @@ fi
439438

440439
### Interactive mode execution
441440
# Check what we are running on
442-
if [ checkAreWeOnMac ]; then
441+
checkAreWeOnMac;macoscheck=$?
442+
checkAreWeOnJbIos;ioscheck=$?
443+
checkAreWeOnLinux;linuxcheck=$?
444+
if [[ "$macoscheck" == "0" ]]; then
443445
# we are on macOS, check for xcode clt
444446
nonInteractiveXcodeCltCheck
445447
if [[ $? == "1" ]]; then
@@ -472,7 +474,7 @@ if [ checkAreWeOnMac ]; then
472474

473475
# i think that's it idk i'm kinda sleepy if i'm going to be honest
474476

475-
elif [ checkAreWeOnJbIos ]; then
477+
elif [[ "$ioscheck" == "0" ]]; then
476478
nonInteractiveCurlCheck
477479
if [[ $? == "1" ]]; then
478480
echo -e "$warn Variscite couldn't locate curl. If it's already installed, make sure that it's in the PATH."
@@ -490,7 +492,7 @@ elif [ checkAreWeOnJbIos ]; then
490492
fi
491493
# was goign to do more stuff here but ios is not supported
492494

493-
elif [ checkAreWeOnLinux ]; then
495+
elif [[ "$linuxcheck" == "0" ]]; then
494496
nonInteractiveCurlCheck
495497
if [[ $? == "1" ]]; then
496498
echo -e "$warn Variscite couldn't locate curl. If it's already installed, make sure that it's in the PATH."

0 commit comments

Comments
 (0)