diff --git a/src/main/java/com/webcodepro/applecommander/ui/ac.java b/src/main/java/com/webcodepro/applecommander/ui/ac.java index 1d6cf2f..be23d01 100644 --- a/src/main/java/com/webcodepro/applecommander/ui/ac.java +++ b/src/main/java/com/webcodepro/applecommander/ui/ac.java @@ -76,6 +76,8 @@ import com.webcodepro.applecommander.util.TextBundle; * -u <imagename> <filename> unlock file on image. * -n <imagename> <volname> change volume name (ProDOS or Pascal). * -cc65 <imagename> <filename> <type> put stdin with cc65 header + * in filename on image, using file type and address from header. DEPRECATED. + * -dos <imagename> <filename> <type> put stdin with cc65 header * in filename on image, using file type and address from header. * -as <imagename> [<filename>] put stdin with AppleSingle format * in filename on image, using file type, address, and (optionally) name @@ -130,7 +132,10 @@ public class ac { } else if ("-n".equalsIgnoreCase(args[0])) { //$NON-NLS-1$ setDiskName(args[1], args[2]); } else if ("-cc65".equalsIgnoreCase(args[0])) { //$NON-NLS-1$ - putCC65(args[1], new Name(args[2]), args[3]); + System.err.println("Note: -cc65 is deprecated. Please use -as or -dos as appropriate."); + putDOS(args[1], new Name(args[2]), args[3]); + } else if ("-dos".equalsIgnoreCase(args[0])) { //$NON-NLS-1$ + putDOS(args[1], new Name(args[2]), args[3]); } else if ("-as".equalsIgnoreCase(args[0])) { putAppleSingle(args[1], args.length >= 3 ? args[2] : null); } else if ("-geos".equalsIgnoreCase(args[0])) { //$NON-NLS-1$ @@ -254,9 +259,9 @@ public class ac { /** * Put <stdin> into the file named fileName on the disk named imageName; - * Assume a cc65 style four-byte header with start address in bytes 0-1. + * Assume an DOS 3.x style four-byte header with start address in bytes 0-1. */ - static void putCC65(String imageName, Name name, String fileType) + static void putDOS(String imageName, Name name, String fileType) throws IOException, DiskException { byte[] header = new byte[4]; diff --git a/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties index 44187b6..4dde6fd 100644 --- a/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties +++ b/src/main/resources/com/webcodepro/applecommander/ui/UiBundle.properties @@ -102,7 +102,7 @@ CreateDirectoryMenuItem=Create Directory... CommandLineErrorMessage = Error: {0} CommandLineNoMatchMessage = {0}: No match. CommandLineStatus = {0} format; {1} bytes free; {2} bytes used. -CommandLineHelp = CommandLineHelp = AppleCommander command line options [{0}]:\n-i [] display information about image(s).\n-ls [] list brief directory of image(s).\n-l [] list directory of image(s).\n-ll [] list detailed directory of image(s).\n-e [] export file from image to stdout\n or to an output file.\n-x [] extract all files from image to directory.\n-g [] get raw file from image to stdout\n or to an output file.\n-p [[$|0x]] put stdin\n in filename on image, using file type and address [0x2000].\n-d delete file from image.\n-k lock file on image.\n-u unlock file on image.\n-n change volume name (ProDOS or Pascal).\n-cc65 put stdin with cc65 header\n in filename on image, using file type and address from header.\n-as [] put stdin with AppleSingle format\n in filename on image, using file type, address, and (optionally) name\n from the AppleSingle file.\n-geos interpret stdin as a GEOS conversion file and\n place it on image (ProDOS only).\n-dos140 create a 140K DOS 3.3 image.\n-pro140 create a 140K ProDOS image.\n-pro800 create an 800K ProDOS image.\n-pas140 create a 140K Pascal image.\n-pas800 create an 800K Pascal image.\n-convert [] uncompress a ShrinkIt or Binary\n II file; or convert a DiskCopy 4.2 image into a ProDOS disk image. +CommandLineHelp = CommandLineHelp = AppleCommander command line options [{0}]:\n-i [] display information about image(s).\n-ls [] list brief directory of image(s).\n-l [] list directory of image(s).\n-ll [] list detailed directory of image(s).\n-e [] export file from image to stdout\n or to an output file.\n-x [] extract all files from image to directory.\n-g [] get raw file from image to stdout\n or to an output file.\n-p [[$|0x]] put stdin\n in filename on image, using file type and address [0x2000].\n-d delete file from image.\n-k lock file on image.\n-u unlock file on image.\n-n change volume name (ProDOS or Pascal).\n-dos put stdin with DOS header\n in filename on image, using file type and address from header.\n-as [] put stdin with AppleSingle format\n in filename on image, using file type, address, and (optionally) name\n from the AppleSingle file.\n-geos interpret stdin as a GEOS conversion file and\n place it on image (ProDOS only).\n-dos140 create a 140K DOS 3.3 image.\n-pro140 create a 140K ProDOS image.\n-pro800 create an 800K ProDOS image.\n-pas140 create a 140K Pascal image.\n-pas800 create an 800K Pascal image.\n-convert [] uncompress a ShrinkIt or Binary\n II file; or convert a DiskCopy 4.2 image into a ProDOS disk image. CommandLineSDKReadOnly = SDK, SHK, and DC42 files are read-only. Use the convert option on them first. CommandLineDC42Bad = Unable to interpret this DiskCopy 42 image.