Extend Travis-CI push to include full package; fix script; fix several typos

.travis.yml

@@ -23,12 +23,15 @@ before_deploy:
   CADIUS="/tmp/cadius/bin/release/cadius" res/package.sh
 - cd $TRAVIS_BUILD_DIR/desk.acc/ &&
   CADIUS="/tmp/cadius/bin/release/cadius" res/package.sh
+- cd $TRAVIS_BUILD_DIR/ &&
+  CADIUS="/tmp/cadius/bin/release/cadius" res/package.sh
 
 deploy:
   provider: releases
   api_key:
     secure: GKESS8qxyVM+0LHVniDMIKLi3ACVXQnacUvzEb/Qn+1PEw6aJ43mv4CQ8E8WyDXSi6i0FXgf72ky+bqa5u/ziYLAwgbtyu3MibNYl2Ryx8B/jdUCQsUPPlf75uBRgQNPt8gj9oBfRFh5omhZdNRaX3VHCYqi1ZrbAO3e2nunhfwddwcMLjl8wnzaM1jdm46lfdvt++GeihqCycdKVOpc6GZQqwwVtrHt9315JCzPJ9BXALxaQL0QSCpJ5uQwVhTS0Sh/k+VqxZ/nUyJ5sqgOulBRHwE0bgqKPV6zrnqftCr1PNwRXkOJfY3eM7ZbWr/vH8TaKU/21fSOxr3NmK/mHqiDun5Sm4duIRl+fm9QAxH93uyxsqPeAmxxSfNnvq6G0k3zFXPiRVgy1ceSIvYFZyCjKQEg0FF+vup0NzP85k8TpX3G4CO/WTOwVvnXruomMO5XpR3bnF1TIffDkU4DGtSpCO7FXH/Kq/CVQw3k155DhXE3IsHCId3bxlFnP0YHk/MS6Unzmcc4DDQS8pIgQII7woMv3g8gYiRQvp4gHbNvDbVi0kyAlJYbQ9lvOWjoFYs+sfxKG6J7AgO4CJ0c10/GwitvzGw9CUeR2O2sgX3i4DUbQEDCKgOO8rj+DqNH70ZtwJZmGG1TZfv1Og+hdoz9rLaFXGw1iFJ5/OXsLK8=
   file:
+    - $TRAVIS_BUILD_DIR/out/A2DeskTop.po
     - $TRAVIS_BUILD_DIR/desktop/out/DeskTop.po
     - $TRAVIS_BUILD_DIR/desk.acc/out/DeskAccessories.po
     - $TRAVIS_BUILD_DIR/desk.acc/res/README_DAS.txt

desktop/desktop_aux.s

@@ -549,7 +549,7 @@ found:  asl     a
 found2: ldx     highlight_count ; new position
         jsr     change_highlight_index
 
-        ;; Remove it from the highloight list and update flag
+        ;; Remove it from the highlight list and update flag
         dec     highlight_count
         lda     highlight_count
         bne     :+
@@ -1880,7 +1880,7 @@ text_width:  .byte   0
 .proc REDRAW_ICONS_IMPL
         jmp     LA2AE
 
-        ;; DT_REDAW_ICON params
+        ;; DT_REDRAW_ICON params
 LA2A9:  .byte   0
 
 LA2AA:  jsr     pop_pointers

desktop/desktop_main.s

@@ -6978,7 +6978,7 @@ L7D5C:  .byte   0
         sbc     L7D96
         pha
         lda     L7D9A+1
-        sbc     L7D96+1         ; wierd - this is discarded???
+        sbc     L7D96+1         ; weird - this is discarded???
         pla
         tay
         pla
@@ -8715,7 +8715,7 @@ create_icon:
         sta     @load_CxFB
         @load_CxFB := *+2
         lda     $C7FB           ; self-modified $CxFB
-        and     #$01            ; $CxFB bit 0 = is RAM card (IIgs Firmware Referece)
+        and     #$01            ; $CxFB bit 0 = is RAM card (IIgs Firmware Reference)
         beq     use_profile_icon
         ;; fall through...
 
@@ -14157,7 +14157,7 @@ saved_proc_buf:
 .endproc
 
 ;;; ============================================================
-;;; Make str_files singlular or plural based on file_count
+;;; Make str_files singular or plural based on file_count
 
 .proc adjust_str_files_suffix
         ldx     str_files
@@ -14167,7 +14167,7 @@ saved_proc_buf:
         cmp     #2              ; > 2?
         bcs     :+
 
-        lda     #' '            ; singlular
+        lda     #' '            ; singular
         sta     str_files,x
         rts
 

desktop/ovl4.s

@@ -1062,7 +1062,7 @@ done:   rts
         bcc     done
         cmp     #'z'+1
         bcs     done
-        and     #$5F            ; convert lowercase to upperase
+        and     #$5F            ; convert lowercase to uppercase
 
 L5B83:  jsr     L5B9D
         bmi     done

macros.inc

@@ -103,7 +103,7 @@ end:
 .endmacro
 
 ;;; ============================================================
-;;; Calls with two paramters (call # in y, address in A,X)
+;;; Calls with two parameters (call # in y, address in A,X)
 ;;; (various output orders to match original binary)
 
 .macro axy_call target, yparam, addr

res/package.sh

@@ -37,7 +37,7 @@ cp "desktop/out/DESKTOP2.built" "$PACKDIR/DESKTOP2"
 # Create a new disk image.
 
 $CADIUS CREATEVOLUME $IMGFILE $VOLNAME 800KB
-$CADIUS CREATEFOLDER $IMGFILE "DESK.ACC"
+$CADIUS CREATEFOLDER $IMGFILE "/$VOLNAME/DESK.ACC"
 
 # Add the files into the disk image.