Merge pull request #19 from wplib/0.16.0

0.16.0

Author: MickMake

bin/composer-1.4

@@ -5,6 +5,7 @@
 
 source /opt/box/includes/functions
 source /opt/box/includes/constants
+source "${WPLIB_BOX_COLORS_FILE}"
 
 #
 #
@@ -26,7 +27,7 @@ if [ "" == "${error}" ];then
 
     if [ "${WPLIB_BOX_COMMAND}" == "help" ]; then
         source "${command_file}"
-        check_updates_available "$*"
+        #check_updates_available "$*"
         echo 1>&2
         exit
     fi

bin/composer-1.5

@@ -9,8 +9,6 @@
 
 DEFAULT_PROJECT="wplib"
 
-source "${WPLIB_BOX_COLORS_FILE}"
-
 # Return codes from functions.
 RETURN_OK="0"
 RETURN_NO_IMAGE_NAME="1"
@@ -122,8 +120,8 @@ error_car()
 error_cas()
 {
 	RETURN="$?"
-	echo "$ECHO_PREFIX ${YELLOW}Warning ${CYAN}${IMAGE}${YELLOW} container already stopped.${RESET}"
-	echo "Look for possible fixes here: ${CYAN}http://wplib.github.io/wplib-box/errors/W018/${RESET}"
+	echo "$ECHO_PREFIX ${CYAN}${IMAGE}${GREEN} container already stopped.${RESET}"
+	# echo "Look for possible fixes here: ${CYAN}http://wplib.github.io/wplib-box/errors/W018/${RESET}"
 	return $RETURN
 }
 

bin/wp-1.0

@@ -8,8 +8,7 @@
 DEFAULT_PROJECT="wplib"
 
 DB_HOST_IP="172.42.0.1"
-source "${WPLIB_BOX_COLORS_FILE}"
-source "${WPLIB_BOX_COMMANDS_DIR}/readJSON"
+source "${WPLIB_BOX_INCLUDES_DIR}/read-json"
 
 trap ctrl_c INT
 
@@ -167,9 +166,6 @@ function database_import() {
     output "Dropping any prior tables"
 
     if [ ! $(has_arg --dryrun) ]; then
-        #
-        # @TODO: Switch this to using Docker
-        #
         box container exec ${database} mysql -h ${DB_HOST_IP} -u wordpress -pwordpress -Nse "show tables;" wordpress 2>&1 | grep -v "Warning:" > /tmp/mysql-table-list.txt
         cat /tmp/mysql-table-list.txt | while read table
 	do