chore(php): refactored the code

Author: shashank-reddy-nr

recipes/newrelic/apm/php/debian.yml

@@ -375,6 +375,7 @@ install:
       cmds:
         - |
           echo -e "{{.ARROW}}Installing New Relic PHP Agent package{{.GRAY}}"
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install newrelic-php5 -y -qq
       silent: true
 
     install_tarball:
@@ -405,11 +406,12 @@ install:
           AGENT_TARBALL="$AGENT.tar.gz"
           # Lack of '/' is important. See above comment where $RELEASE_URL is
           # defined. An extraneous '/' here treats the URL as an HTML doc.
-          curl -s -O "$RELEASE_URL$AGENT_TARBALL"
+          curl -s "$RELEASE_URL$AGENT_TARBALL" -o "$AGENT_TARBALL"
           gzip -dc "$AGENT_TARBALL" | tar xf -
-          cd "$AGENT"
+          pushd "$AGENT" > /dev/null
           echo -e "{{.WHITE}}Running PHP Agent installer{{.GRAY}}"
           NR_INSTALL_USE_CP_NOT_LN=1 NR_INSTALL_SILENT=true NR_INSTALL_KEY="{{.NEW_RELIC_LICENSE_KEY}}" ./newrelic-install install
+          popd > /dev/null
 
     configure:
       cmds:
@@ -459,26 +461,25 @@ install:
           echo -e "{{.YELLOW}}cli dir path after change is $CLI_INI_DIR{{.GRAY}}"
           echo -e "{{.YELLOW}}web dir path after change is $WEB_INI_DIR{{.GRAY}}"
           INI_DIRS=($WEB_INI_DIR $CLI_INI_DIR)
-          for dirs in "${INI_DIRS[@]}"; do
+          for dirs in $INI_DIRS; do
             for ini in $dirs; do
               echo -e "{{.YELLOW}}ini path is $ini{{.GRAY}}"
               #
               # Get the PHP INI Directory associated with this specific NR INI file
               #
               php_ini_dir=$(echo $ini | sed -n 's/\(.*\)\/conf.d/\1/p')
-              if [ -z "${php_ini_dir}" ]; then
-                if [[ "$dirs" == "$WEB_INI_DIR" ]]; then
+              if [[ -z "${php_ini_dir}" ]]; then
+                if [[ -z "${CLI_DIRS}" ]]; then
                     if [[ -d "${ini}/../apache2" ]]; then
                       php_ini_dir="${ini}/../apache2"
                     fi
                     if [[ -d "${ini}/../fpm" ]]; then
                       php_ini_dir="${ini}/../fpm"
                     fi
-                elif [[ "$dirs" == "$CLI_INI_DIR" ]]; then  
-                  php_ini_dir="${php_ini_dir}/../cli"
+                elif [[ -d "${ini}/../cli" ]]; then
+                  php_ini_dir="${ini}/../cli"
                 else
-                  echo -e "something went wrong while checking for paths"
-                  php_ini_dir=${ini}
+                  php_ini_dir=$ini
                 fi
               fi
               echo -e "{{.YELLOW}}php ini dir path is: $php_ini_dir{{.GRAY}}"
@@ -533,7 +534,7 @@ install:
               #
               target_ini_dir="/etc/php5/conf.d/"
               if [ -x /usr/sbin/phpquery ]; then
-                target_ini_dir="${ini}"
+                target_ini_dir="${php_ini_dir}/../mods-available/"
               elif [ -x /usr/sbin/php5endmod ]; then
                 target_ini_dir="/etc/php5/mods-available/"
               fi
@@ -546,8 +547,9 @@ install:
               # This ensures we always get the most up to date newrelic.ini file on the
               # system.
               #
-          
-              if [ ! -f "${target_ini_dir}/$(basename ${ini_full_name})" ]; then
+
+              ini_dir=$(dirname "$ini_full_name")
+              if [[ "$ini_dir" != "$target_ini_dir" ]]; then
                 mv "${ini_full_name}" "${target_ini_dir}"
               fi
 
@@ -660,10 +662,9 @@ install:
                 #
                 info_text="{{.TMP_INSTALL_DIR}}/cli_info.txt"
               fi
-              cat "${info_text}"
               while read -r bin_loc php_ini_dir nr_ini_dir; do
                 echo -e "bin_loc is ${bin_loc}, php_ini_dir is ${php_ini_dir} and nr_ini_dir is ${nr_ini_dir}"
-                sudo -u $nonpriv_user $bin_loc -c "${php_ini_dir}/php.ini" -c "${nr_ini_dir}/newrelic.ini" -n --ini &>/dev/null
+                sudo -u $nonpriv_user $bin_loc -c "${php_ini_dir}/php.ini" -c "${nr_ini_dir}/newrelic.ini" -n --ini
               done < "${info_text}"
             done
           else