Man pages

.gitignore

@@ -1 +1,4 @@
-build
+src/binhack/bin/binhack
+src/cdirip/cdirip
+src/isofix/isofix
+src/scramble/scramble

Makefile

@@ -1,37 +1,49 @@
 VERSION=$(shell gawk '/^VERSION/ {print $1}' bin/mksdiso | cut -f2 -d\")
 BUILD_DIR=build/mksdiso-$(VERSION)-all
 
-default:
+default: compile
+
+help:
 	@echo "Usage: make <package|install|clean>"
 	@echo "   package | Build debian Package"
 	@echo "   install | install to /usr/local/bin"
-	@echo "   clean   | cleanup package build directory"
+	@echo "   clean   | cleanup object files and package build directory"
 	exit 0
 
-package:
+compile:
+	$(MAKE) -C src
+
+package: compile
 	mkdir -p $(BUILD_DIR)/usr/bin $(BUILD_DIR)/usr/share/mksdiso $(BUILD_DIR)/DEBIAN
 	cp debian/control $(BUILD_DIR)/DEBIAN/
 	cp bin/* $(BUILD_DIR)/usr/bin/
+	cp src/binhack/bin/binhack $(BUILD_DIR)/usr/bin/
+	cp src/cdirip/cdirip $(BUILD_DIR)/usr/bin/
+	cp src/isofix/isofix $(BUILD_DIR)/usr/bin/
+	cp src/makeip/makeip $(BUILD_DIR)/usr/bin/
+	cp src/scramble/scramble $(BUILD_DIR)/usr/bin/
 	cp -r mksdiso/* $(BUILD_DIR)/usr/share/mksdiso/
-	sed -i 's/^DATADIR=.*/DATADIR=\/usr\/share\/mksdiso/' $(BUILD_DIR)/usr/bin/mksdiso
 	sed -i 's/^Version:.*/Version:\ $(VERSION)/' $(BUILD_DIR)/DEBIAN/control
 	dpkg-deb --build $(BUILD_DIR)
 
-# Local install, modifes mksdiso-data-path to /usr/local/share/mksdiso
-install:
-	cp -r bin/* /usr/local/bin/
-	sed -i 's/^DATADIR=.*/DATADIR=\/usr\/local\/share\/mksdiso/' /usr/local/bin/mksdiso
-	mkdir -p /usr/local/share || true
+# Local sysadmin install goes to /usr/local/
+install: compile
+	$(MAKE) -C src install
+	mkdir -p /usr/local/share
 	cp -r mksdiso /usr/local/share/
+	cp -r bin/* /usr/local/bin/
 
 uninstall:
-	rm -r /usr/local/share/mksdiso || true
-	rm /usr/local/bin/mksdiso || true
-	rm /usr/local/bin/cdirip  || true
-	rm /usr/local/bin/isofix  || true
-	rm /usr/local/bin/binhack32 || true
-	rm /usr/local/bin/burncdi || true
-	rm /usr/local/bin/scramble || true
-
-clean:
-	rm -r build/
+	-rm -r /usr/local/share/mksdiso
+	-rm /usr/local/bin/mksdiso
+	-rm /usr/local/bin/cdirip 
+	-rm /usr/local/bin/isofix 
+	-rm /usr/local/bin/binhack
+	-rm /usr/local/bin/burncdi 
+	-rm /usr/local/bin/scramble
+
+clean-package:
+	-rm -r $(BUILD_DIR)
+
+clean:	clean-package
+	$(MAKE) -C src clean

bin/burncdi

@@ -93,6 +93,7 @@ if [ -d ${EXT_DIR} ] ; then
     show_help "ERROR while unpacking CDI using cdirip!"
 fi
 
+unset BLOCKSIZE			# In case user set blocksize=human for du.
 if [ $(du -s ${EXT_DIR} 2> /dev/null | awk '{print $1}') -ge 700000 -a "$OVERBURN" == "" ] ; then
     echo "---------------------------------------------------"
     echo "CRITICAL_ERROR: Extracted files are too big, to fit on a CD-R..."

bin/mksdiso

@@ -4,23 +4,35 @@ IFS=$'\n'
 VERSION="0.9.2"
 echo "mksdiso Ver. $VERSION | By Nold 2013-2017 | Visit: https://nold.in"
 
-# Directory which includes the IP.BIN files included in mksdiso source git
-DATADIR=$HOME/.mksdiso
-
 # Set save defaults
 DEL_IN_DIR=0
 
+# Directory which includes the IP.BIN files included in mksdiso source git
+DATADIR=$HOME/.mksdiso
+for d in $HOME/.mksdiso {$HOME/.local,/usr/local,/usr}/share/mksdiso; do
+    if [[ -d "$d" ]]; then
+	if [[ -s "$d/katana/IP.BIN" || -s "$d/homebrew/IP.BIN" ]]; then
+	    DATADIR="$d"
+	    break
+	fi
+    fi
+done
+
 function usage() {
-    echo "Usage: $(basename $0) < -h | -k > <INPUT-DIR/-ISO/-CDI> [OUTPUT-DIR/-ISO]"
-    echo "This script convertes a "normal" Dreamcast game image into a SD-ISO-Image"
-    echo "For usage with Dreamshell ISO-Loader"
-    echo
-    echo "Paramaters:"
-    echo -e "\t-h | Create ISO from Homebrew"
-    echo -e "\t-k | Create ISO from Katana Image\n"
-    echo
-    echo "Supported Source-Files: CDI, ISO, Directory"
-    echo "Feel free to open issues/contribute at https://github.com/nold360/mksdiso"
+    cat <<EOF
+Usage: $(basename $0) < -h | -k > <INPUT-DIR/-ISO/-CDI> [OUTPUT-DIR/-ISO]
+
+This script converts a "normal" Dreamcast game image into a SD-ISO-Image
+for usage with Dreamshell ISO-Loader.
+
+Parameters:
+	-h | Create ISO from Homebrew
+	-k | Create ISO from Katana Image
+
+Supported Source-Files: CDI, ISO, Directory
+
+Feel free to open issues/contribute at https://github.com/nold360/mksdiso
+EOF
 }
 
 # Check for needed binaries
@@ -36,7 +48,7 @@ function check_dependencies() {
         ISOTOOL=mkisofs
     fi
 
-    for bin in binhack32 cdirip isofix scramble 7z; do
+    for bin in binhack cdirip isofix scramble 7z; do
         if ! type $bin &>/dev/null ; then
             echo "Please install $bin or include it in \$PATH"
             exit 1
@@ -71,9 +83,9 @@ function hack_lba() { #ARGs: target-dir
         fi
     fi
 
-    # FIXME: Copy IP.BIN, Workaround for binhack32 :/
+    # FIXME: Copy IP.BIN, Workaround for binhack :/
     cp ${DATADIR}/katana/IP.BIN IP.BIN
-    echo -e -n "${1}/1ST_READ.BIN\nIP.BIN\n0\n" | binhack32
+    echo -e -n "${1}/1ST_READ.BIN\nIP.BIN\n0\n" | binhack
     rm IP.BIN
     return 0
 }

share/man/man1/burncdi.1

@@ -0,0 +1,113 @@
+.TH BURNCDI 1
+.SH NAME
+burncdi \- Burn a DiscJuggler CDI image directly to a CD-R.
+.
+.
+.\" ====================================================================
+.SH SYNOPSIS
+.\" ====================================================================
+.
+.SY burncdi
+.I image.cdi
+.OP \-f
+.OP \-c CDRW-DRIVE
+.I CDI-File
+.YS
+.
+.
+.\" ====================================================================
+.SH DESCRIPTION
+.\" ====================================================================
+.
+The
+.B burncdi
+program is part of the
+.I mksdiso
+free software collection of Sega Dreamcast utilities available at 
+.UR https://\:github.com/Nold360/mksdiso
+Nold360's Github
+.UE .
+.
+.P
+The
+.B burncdi
+program is a wrapper around
+.IR cdirip (1)
+and
+.IR wodim (1)
+or
+.IR cdrecord (1).
+It both converts a file from DiscJuggler CDI format and burns the
+result to a CD-R. Temporary files are automatically cleaned up.
+.
+.
+.\" ====================================================================
+.SH OPTIONS
+.\" ====================================================================
+.
+.TP
+.BI \-f
+Force burning of image & enable overburning.
+.
+.TP
+.B \-c \fICDRW-DRIVE\fR
+Specify path to CD writer if not /dev/cdrw.
+.
+.TP
+.I CDI-FIle
+A file in DiscJuggler's CDI format. Often this will be a bootable
+.I SEGA Dreamcast
+disc.
+.
+.\" ====================================================================
+.SH "USING BURNCDI"
+.\" ====================================================================
+.
+Place a blank CD-R in the drive and simply run
+.B burncdi
+with the name of your .cdi file. After a short time, you should have a
+usable disc written with proper audio and data sessions.
+.IP
+.EX
+burncdi foo.cdi
+.EE
+.
+.P
+Note that you will need to have enough free space in /tmp to hold the
+uncompressed disc image and audio files. Temporary files will be
+deleted when
+.BR burncdi
+exits.
+.
+.\" ====================================================================
+.SH BUGS
+.\" ====================================================================
+.
+None?
+.
+.\" ====================================================================
+.SH AUTHORS
+.\" ====================================================================
+.
+.B burncdi
+was written by
+.UR https://nold.in/
+Nold
+.UE .
+.
+.\" ====================================================================
+.SH "SEE ALSO"
+.\" ====================================================================
+.
+.BR cdirip (1),
+.BR wodim (1),
+.BR cdrecord (1).
+.
+.\" ====================================================================
+.\" Emacs setup
+.\" ====================================================================
+.
+.\" Local Variables:
+.\" mode: nroff
+.\" End:
+.\" vim: set filetype=groff: