packaged pgdiff, pgrun, and pgdiff.sh for OSX and Linux

Former-commit-id: 5a5b59f

Author: joncrlsn

bin-linux/README.md

@@ -0,0 +1,16 @@
+## Linux pgdiff instructions
+
+These instructions will guide you through the process of generating SQL, reviewing it, and optionally running it on the target database. It requires a familiarity with a Linux command-line shell.
+
+1. download pgdiff.tgz to your machine
+1. untar pgdiff.tgz (a new directory will be created: called pgdiff)
+1. cd into the new pgdiff directory
+1. optionally edit pgdiff.sh to change the db access values... or set them at runtime (i.e. USER1=joe NAME1=mydb USER2=joe NAME2=myotherdb pgdiff.sh)
+1. run pgdiff.sh
+
+## tar contents
+* pgdiff - a linux executable
+* pgrun - a linux executable for running SQL
+* pgdiff.sh - a bash shell script to coordinate your interaction with pgdiff and pgrun
+
+If you write a Go version of pgdiff.sh, please share it and I'll include it for others to use (with your copyright information intact). 

bin-linux/pgdiff.REMOVED.git-id

@@ -0,0 +1 @@
+b33644e000965e421a9c120a899ac60ad17eab46

bin-linux/pgdiff.tgz.REMOVED.git-id

@@ -0,0 +1,16 @@
+## OSX / Mac pgdiff instructions
+
+These instructions will guide you through the process of generating SQL, reviewing it, and optionally running it on the target database.  It requires a familiarity with the bash shell in OSX.
+
+1. download pgdiff.tgz to your machine
+1. untar pgdiff.tgz (a new directory will be created: called pgdiff)
+1. cd into the new pgdiff directory
+1. optionally edit pgdiff.sh to change the db access values... or set them at runtime (i.e. USER1=joe NAME1=mydb USER2=joe NAME2=myotherdb pgdiff.sh)
+1. run pgdiff.sh
+
+## tar contents
+* pgdiff - an OSX executable
+* pgrun - an OSX executable for running SQL
+* pgdiff.sh - a bash shell script to coordinate your interaction with pgdiff and pgrun
+
+If you write a Go version of pgdiff.sh, please share it and I'll include it for others to use (with your copyright information intact). 

bin-osx/README.md

@@ -0,0 +1 @@
+b9845f185d9d08d675362c1e59d30a1eb077cbb6

bin-osx/pgdiff.REMOVED.git-id

@@ -0,0 +1 @@
+1675e9f7afb3e2aa2a11db7aa34ccc08f7637a94

bin-osx/pgdiff.tgz.REMOVED.git-id

@@ -5,6 +5,7 @@ SCRIPT_DIR="$(dirname `ls -l $0 | awk '{ print $NF }'`)"
 [[ -z $APPNAME ]] && APPNAME=pgdiff
 
 if [[ -d bin-linux ]]; then
+    echo "  ==== Building Linux ===="
     tempdir="$(mktemp -d -t $APPNAME)"
     workdir="$tempdir/$APPNAME"
     echo $workdir
@@ -16,27 +17,43 @@ if [[ -d bin-linux ]]; then
     # Copy the bash runtime script to the temp directory
     cp pgdiff.sh "$workdir/"
     cd "$tempdir"
-    zip -r "${APPNAME}.zip" $APPNAME
-    mv "${APPNAME}.zip" "$SCRIPT_DIR/bin-linux/"
+    # Make everything executable
+    chmod -v ugo+x $APPNAME/*
+    COPYFILE_DISABLE=true tar -cvzf "${APPNAME}.tgz" $APPNAME
     cd -
+    mv "${tempdir}/${APPNAME}.tgz" "${SCRIPT_DIR}/bin-linux/"
     echo "Built linux."
 else
     echo "Skipping linux.  No bin-linux directory."
 fi
 
-#### DON'T LEAVE THIS
-exit 1
-
 if [[ -d bin-osx ]]; then
-    GOOS=darwin GOARCH=386 go build -o bin-osx/${APPNAME}
+    echo "  ==== Building OSX ===="
+    tempdir="$(mktemp -d -t $APPNAME)"
+    workdir="$tempdir/$APPNAME"
+    echo $workdir
+    mkdir -p $workdir
+    # Build the executable
+    GOOS=darwin GOARCH=386 go build -o "$workdir/$APPNAME"
+    # Download pgrun to the work directory 
+    wget -O "$workdir/pgrun" "https://github.com/joncrlsn/pgrun/raw/master/bin-osx/pgrun"
+    # Copy the bash runtime script to the temp directory
+    cp pgdiff.sh "$workdir/"
+    cd "$tempdir"
+    # Make everything executable
+    chmod -v ugo+x $APPNAME/*
+    COPYFILE_DISABLE=true tar -cvzf "${APPNAME}.tgz" $APPNAME
+    cd -
+    mv "${tempdir}/${APPNAME}.tgz" "${SCRIPT_DIR}/bin-osx/"
     echo "Built osx32."
 else
     echo "Skipping osx.  No bin-osx directory."
 fi
 
 if [[ -d bin-win ]]; then
+    echo "  ==== Building Windows ===="
     GOOS=windows GOARCH=386 go build -o bin-win/${APPNAME}.exe
-    echo "Built win32."
+    echo "Built win."
 else
     echo "Skipping win.  No bin-win directory."
 fi

bin-win/pgrun.exe.REMOVED.git-id

@@ -1,9 +1,9 @@
 #!/bin/bash
 #
-# pgdiff.sh runs a compare on each schema type in the order that creates the fewest conflicts.  At each step you are allowed to review 
-# and optionally change and/or run the generated SQL.
+# pgdiff.sh runs a compare on each schema type in the order that usually creates the fewest conflicts.  
+# At each step you are allowed to review  and optionally change and/or run the generated SQL.
 #
-# If you convert this to a windows batch file, please share it.
+# If you convert this to a windows batch file (or, even better, a Go program), please share it.
 #
 # pgdiff -U postgres -W supersecret -D maindb -O sslmode=disable -u postgres -w supersecret -d stagingdb -o sslmode=disable COLUMN
 #
@@ -51,16 +51,16 @@ function rundiff() {
 }
 
 rundiff FUNCTION
-#rundiff ROLE
-#rundiff SEQUENCE
+rundiff ROLE
+rundiff SEQUENCE
 rundiff TABLE
-#rundiff VIEW
-#rundiff OWNER
+rundiff VIEW
+rundiff OWNER
 rundiff COLUMN
-#rundiff INDEX
-#rundiff FOREIGN_KEY
-#rundiff GRANT_RELATIONSHIP
-#rundiff GRANT_ATTRIBUTE
+rundiff INDEX
+rundiff FOREIGN_KEY
+rundiff GRANT_RELATIONSHIP
+rundiff GRANT_ATTRIBUTE
 rundiff TRIGGER
 
 echo "Done!"