scottwb

diff --git a/cookbooks/php/providers/pear.rb b/cookbooks/php/providers/pear.rb
index db90e17..0172fca 100644
--- a/cookbooks/php/providers/pear.rb
+++ b/cookbooks/php/providers/pear.rb
@@ -155,7 +155,8 @@ def upgrade_package(name, version)
   command = "echo \"\r\" | #{@bin} -d"
   command << " preferred_state=#{can_haz(@new_resource, "preferred_state")}"
   command << " upgrade -a#{expand_options(@new_resource.options)}"
-  command << " #{prefix_channel(can_haz(@new_resource, "channel"))}#{name}-#{version}"
+  command << " #{prefix_channel(can_haz(@new_resource, "channel"))}#{name}"

scottwb

diff --git a/cookbooks/mysql/libraries/helpers.rb b/cookbooks/mysql/libraries/he
index c850233..1a5d99c 100644
--- a/cookbooks/mysql/libraries/helpers.rb
+++ b/cookbooks/mysql/libraries/helpers.rb
@@ -30,15 +30,18 @@ module Opscode
       end

       def assign_root_password_cmd
+        return nil unless node['mysql']['server_root_password']
         str = '/usr/bin/mysqladmin'

scottwb

# This is a workaround for the Haml bug:
#
#   https://github.com/haml/haml/issues/645
#
module Haml
  module Filters
    class SassRailsTemplate
      def render(scope=Object.new, locals={}, &block)
        scope = ::Rails.application.assets.context_class.new(
          "::Rails.application.assets",

scottwb

#!/bin/sh

# Put somewhere in your $PATH and call the file `emacs`

/Applications/Emacs.app/Contents/MacOS/Emacs $1 $2 $3 1>&2 > /dev/null &

scottwb

#!/usr/bin/env ruby

# This file demonstrates a simple experiment to make a hierarchy of config classes
# where each class can simply define a hash of config values which augment/override
# those of it's parent class. Each class uses class methods to access the config
# values by name. In addition to the config hash, each class can define custom
# class methods that combine/format config values, even if those values are actually
# defined in an ancestor or descendant class.

class BaseConfig

scottwb

#!/usr/bin/env ruby
#
# Drops all the tables in a MySQL database, without dropping the databse.
#

###############################################################################
# Usage
###############################################################################
usage=<<EOT

scottwb

#!/bin/sh
# Shows how to do replacment in a string variable in bash.

SRC_STRING=/Applications/something
REPLACED_STRING=${SRC_STRING//\//\\/}

echo "Source String is: $SRC_STRING"
echo "Replaced String is: $REPLACED_STRING"

scottwb

#!/usr/bin/env ruby
#
# Quick-and-dirty script to kill rogue script/server processes.
#

###############################################################################
# Configuration
###############################################################################

# The command you use to run your Rails server.

scottwb

#!/usr/bin/env ruby
#
# Script to search for a string in a set of configured dirs. The main
# value of this is to provide:
#
#   * Easy configuration for a common set of directories you like to
#     grep through, and the file patterns to match per directory.
#
#   * Easy configuration for the common grep options you like to use.
#

scottwb

#!/bin/sh
#
# Script to create an SSL .pem certificate.
#
# Adapted from Fedora's /etc/pki/tls/certs/Makefile. Only tested on
# Mac OS X 10.5.
#

PEMFILE=$1