Fix an issue during installation on iOS 16, better usage info, some s…

…afety checks

docs/source/conf.py

@@ -23,7 +23,7 @@
 author = 'cynder'
 
 # The full version, including alpha/beta/rc tags
-release = '1.7.0'
+release = '1.7.1'
 
 # -- General configuration ---------------------------------------------------
 

setup.py

@@ -3,7 +3,7 @@
 from setuptools import setup
 
 setup(name='dragon',
-      version='1.7.0',
+      version='1.7.1',
       description='A powerful toolkit targeting Apple development, research, and packaging.',
       author='cynder',
       url='https://dragon.cynder.me/',

src/dragon/config/banner.txt

@@ -10,7 +10,7 @@
 ████      ▀█¬      ▐███████    ▐███▌       ▐██   ▐██  ▐██    ██▀  ▐██  ██▄   ██▌ ▐██   ▐██  ██    ██
 ▀███,           ;.┌████████─▌  ████         ▀████▀██  ▐██    ▀████▀██   ▀███▀██▌  ▀█████▀   ██    ██
  ████         ▄▀╓██████████ ╫▌▄███▌                                     ▄▄▄.▄██
- └████,   ╓▄██└▄█████████▌▌ █████▀                                       ▀▀▀▀          version 1.7.0
+ └████,   ╓▄██└▄█████████▌▌ █████▀                                       ▀▀▀▀          version 1.7.1
    █████████┌▄███████████═ ▄████▀                                                           ~ cynder
     ╙████████████████████▓████▀
       └▀████████████████████▀               this project was made possible by Lorenzo Pane.

src/dragon/shscripts/building

@@ -3,6 +3,9 @@
 clean_dir()
 {
     prefix_print "Cleaning $1"
+    if [ -z "$DRAGON_DIR" ];  then
+      drexit_reason "nil DRAGON_DIR"
+    fi
     # find . -name 'build.ninja' -delete
     if [[ -f $DRAGON_DIR/DragonMake ]]; then
         cp $DRAGON_DIR/DragonMake .DragonMake
@@ -19,6 +22,9 @@ build()
     # shellcheck disable=SC2046
     cd $(python3 -c "print('.' if '$1.ninja' in '$(ls | xargs)' else '$1')") || drexit
     python3 -c "exit(0 if ('${project_dirs}'.count('.')<2) else 1)" && mv "$(ls *.ninja | xargs | cut -d' ' -f1)" ./build.ninja
+    if [ -z "$DRAGON_DIR" ];  then
+      drexit_reason "nil DRAGON_DIR"
+    fi
     if ! [[ -d $DRAGON_DIR/_/.dragonbuilding ]]; then
         rm -rf $DRAGON_DIR/_
     fi

src/dragon/shscripts/packaging

@@ -39,7 +39,7 @@ send_package()
     TMP_PATH="/tmp/dragon/packages"
     FILE_PATH="/tmp/dragon/$OUTPUT"
     python3 -m dragon.device qr mkdir -p $TMP_PATH
-    (scp -P $DRBPORT ${OUTPUT} root@$DRBIP:$FILE_PATH && python3 -m dragon.device qr "apt install -y --reinstall $FILE_PATH; rm -r $(dirname $TMP_PATH)") || drexit 1
+    (scp -P $DRBPORT ${OUTPUT} root@$DRBIP:$FILE_PATH && python3 -m dragon.device qr "dpkg -i $FILE_PATH; rm -r $(dirname $TMP_PATH)") || drexit 1
 }
 
 create_package()

src/dragon/shscripts/util

@@ -4,6 +4,12 @@
 TOOLPATH=$(python3 -c 'from dragon.util import tool_path; print(tool_path())')
 source $TOOLPATH/dragoncolors
 
+drexit_reason()
+{
+  prefix_print $1
+  drexit
+}
+
 drexit()
 {
     # This function resets terminal colors, fixes stty (just in case), and then exits with arg0's value
@@ -63,42 +69,32 @@ update()
 
 usage()
 {
-    echo ""
+    echo -e ""
     echo -e "${PrefixColor}dragon v${DRAGON_VERS} ${BoldColor}-=-=-${NC}"
-    echo "  usage: dragon [commands]"
+    echo -e "  usage: dragon [commands]"
     echo ""
     echo -e "${PrefixColor}Building ${BoldColor}-=-=-${NC}"
-    echo "  n|new|nic|edit|create - Open the project editor (For creating new projects/adding to existing ones)"
-    echo "  do - Build and Install"
-    echo "  c|clean - recompile, link, and package your project"
-    echo "  b|build|make - compile, link, and package your project"
-    echo "  r|remote - Build using remote server"
-    echo "  sr|rconf - Setup remote server"
+    echo -e "  ${PackageColor}n${NC}|new|nic|edit|create - ${BoldColor}Open the project editor (For creating new projects/adding to existing ones)${NC}"
+    echo -e "  ${PackageColor}do${NC} - ${BoldColor}Build and Install${NC}"
+    echo -e "  ${PackageColor}c${NC}|clean - ${BoldColor}Clear build cache${NC}"
+    echo -e "  ${PackageColor}b${NC}|build|make - ${BoldColor}Compile, link, and package your project${NC}"
     echo ""
     echo -e "${PrefixColor}Installation ${BoldColor}-=-=-${NC}"
-    echo "  s|device - Set build device IP/Port"
-    echo "  i|install - Install to build device"
-    echo "  sim - Install to the simulator instead of a device"
-    echo "  rs|respring - Respring the current build device"
-    echo "  dr|devicerun - Run anything after this flag on device"
-    echo "  sn|send <file> - Install a .deb to the device"
+    echo -e "  ${PackageColor}s${NC}|device - ${BoldColor}Set build device IP/Port${NC}"
+    echo -e "  ${PackageColor}i${NC}|install - ${BoldColor}Install to build device${NC}"
+    echo -e "  ${PackageColor}sim${NC} - ${BoldColor}Install to the simulator instead of a device${NC}"
+    echo -e "  ${PackageColor}rs${NC}|respring - ${BoldColor}Respring the current build device${NC}"
+    echo -e "  ${PackageColor}dr${NC}|devicerun - ${BoldColor}Run anything after this flag on device${NC}"
+    echo -e "  ${PackageColor}sn${NC}|send <file> - ${BoldColor}Install a .deb to the device${NC}"
     echo ""
     echo -e "${PrefixColor}Tools ${BoldColor}-=-=-${NC}"
-    echo "  d|debug [Process Name] - Start a debugging server on device and connect to it (Can be used with the install flag as well)"
-    echo "  exp|export - Tell ninja to create a compile_commands.json"
-    echo "  f|flutter - Build with flutter before doing anything else"
-    echo "  ch|checkra1n - Open Checkra1n GUI"
-    echo "  chc|checkra1ncli - Open Checkra1n CLI"
-    echo ""
-    echo -e "${PrefixColor}Debugging ${BoldColor}-=-=-${NC}"
-    echo "  vn - Print clang/ld/etc. commands and flags"
-    echo "  vd - echo every bash command in the main dragon file"
-    echo "  vg - DragonGen verbositiy."
-    echo "  norm - Doesn't delete build.ninja after building."
-    echo "  ddebug - Enable all debug flags"
+    echo -e "  ${PackageColor}d${NC}|debug [Process Name] - ${BoldColor}Start a debugging server on device and connect to it (Can be used with the install flag as well)${NC}"
+    echo -e "  ${PackageColor}exp${NC}|export - ${BoldColor}Tell ninja to create a compile_commands.json${NC}"
     echo ""
     echo -e "${PrefixColor}-=-=-${NC}"
     echo ""
-    echo "dragon v${DRAGON_VERS} by cynder"
-    echo "lead contributors: Lorenzo Pane and Lightmann"
+    echo "dragon v${DRAGON_VERS}"
+    echo "created by cynder, made possible through crucial contributions from Lorenzo Pane, Lightmann"
+    echo "with contributions from: iCrazeiOS, Squidkingdom, Amy While, Conor, MrGcGamer, jaidan, Diego Magdaleno"
+    # <3
 }