fix(php): fixed php guided install failure

shashank-reddy-nr · shashank-reddy-nr · commit 3fa04a9742a3 · 2024-11-05T00:39:04.000+05:30
diff --git a/recipes/newrelic/apm/php/debian.yml b/recipes/newrelic/apm/php/debian.yml
@@ -520,7 +520,7 @@ install:
               #
               target_ini_dir="/etc/php5/conf.d/"
               if [ -x /usr/sbin/phpquery ]; then
-                target_ini_dir="${ini}/../../mods-available/"
+                target_ini_dir="${ini}"
               elif [ -x /usr/sbin/php5endmod ]; then
                 target_ini_dir="/etc/php5/mods-available/"
               fi
@@ -533,7 +533,10 @@ install:
               # This ensures we always get the most up to date newrelic.ini file on the
               # system.
               #
-              mv ${ini_full_name} ${target_ini_dir}
+          
+              if [ ! -f "${target_ini_dir}/$(basename ${ini_full_name})" ]; then
+                mv "${ini_full_name}" "${target_ini_dir}"
+              fi
 
               #
               # We rely on the package installer to enable the newrelic module.

Original file line number	Diff line number	Diff line change
`@@ -520,7 +520,7 @@ install:`
`520`	`520`	`#`
`521`	`521`	`target_ini_dir="/etc/php5/conf.d/"`
`522`	`522`	`if [ -x /usr/sbin/phpquery ]; then`
`523`		`- target_ini_dir="${ini}/../../mods-available/"`
	`523`	`+ target_ini_dir="${ini}"`
`524`	`524`	`elif [ -x /usr/sbin/php5endmod ]; then`
`525`	`525`	`target_ini_dir="/etc/php5/mods-available/"`
`526`	`526`	`fi`
`@@ -533,7 +533,10 @@ install:`
`533`	`533`	`# This ensures we always get the most up to date newrelic.ini file on the`
`534`	`534`	`# system.`
`535`	`535`	`#`
`536`		`- mv ${ini_full_name} ${target_ini_dir}`
	`536`	`+`
	`537`	`+ if [ ! -f "${target_ini_dir}/$(basename ${ini_full_name})" ]; then`
	`538`	`+ mv "${ini_full_name}" "${target_ini_dir}"`
	`539`	`+ fi`
`537`	`540`
`538`	`541`	`#`
`539`	`542`	`# We rely on the package installer to enable the newrelic module.`