Merge branch 'upgrade-scripts-py3'

performancecopilot · Jul 23, 2024 · d9ca6e2 · d9ca6e2
2 parents 9fb5fce + dbe0f25
commit d9ca6e2
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 12 deletions.
diff --git a/src/pmdas/bcc/Upgrade b/src/pmdas/bcc/Upgrade
@@ -30,9 +30,13 @@ then
     then
         if grep '^bcc.*python ' "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
         then
-            :	 # already using $PCP_PYTHON_PROG, leave this line untouched
+            :	# already using $PCP_PYTHON_PROG, leave this line untouched
         else
-	    sed -i -e "s,python $PCP_PMDAS_DIR/bcc/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/bcc/,g" $PCP_PMCDCONF_PATH 2>/dev/null
+	    # convert hard-coded python or python3 binary to PCP_PYTHON_PROG
+	    sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+		-e "s,python3 $PCP_PMDAS_DIR/bcc/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/bcc/,g" \
+		-e "s,python $PCP_PMDAS_DIR/bcc/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/bcc/,g" \
+	    # end
         fi
     fi
 fi

diff --git a/src/pmdas/elasticsearch/Upgrade b/src/pmdas/elasticsearch/Upgrade
@@ -24,12 +24,16 @@ then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else
 	# convert hard-coded python binary to PCP_PYTHON_PROG
-        sed -i -e "s,python $PCP_PMDAS_DIR/elasticsearch/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/elasticsearch/,g" $PCP_PMCDCONF_PATH 2>/dev/null
+        sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	    -e "s,python3 $PCP_PMDAS_DIR/elasticsearch/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/elasticsearch/,g" \
+	    -e "s,python $PCP_PMDAS_DIR/elasticsearch/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/elasticsearch/,g" \
+	# end
     fi
     if grep -q '^elasticsearch.*perl ' "$PCP_PMCDCONF_PATH"
     then
 	# convert original perl implementation to python
-        sed -i -e "s,perl $PCP_PMDAS_DIR/elasticsearch/pmdaelasticsearch.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/elasticsearch/pmdaelasticsearch.python,g" $PCP_PMCDCONF_PATH 2>/dev/null
+        sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	    -e "s,perl $PCP_PMDAS_DIR/elasticsearch/pmdaelasticsearch.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/elasticsearch/pmdaelasticsearch.python,g"
     fi
 fi
 exit 0
diff --git a/src/pmdas/mssql/Upgrade b/src/pmdas/mssql/Upgrade
@@ -19,7 +19,9 @@
 
 if grep -q '^mssql.*perl ' "$PCP_PMCDCONF_PATH" 2>/dev/null
 then
-    sed -i -e "s,perl $PCP_PMDAS_DIR/mssql/pmdamssql.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/mssql/pmdamssql.python,g" $PCP_PMCDCONF_PATH 2>/dev/null
+    # convert original perl implementation to python
+    sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	-e "s,perl $PCP_PMDAS_DIR/mssql/pmdamssql.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/mssql/pmdamssql.python,g"
 fi
 
 if grep -q '^mssql.*python ' "$PCP_PMCDCONF_PATH" 2>/dev/null
@@ -28,7 +30,11 @@ then
     then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else
-	sed -i -e "s,python $PCP_PMDAS_DIR/mssql/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/mssql/,g" $PCP_PMCDCONF_PATH 2>/dev/null
+	# convert hard-coded python or python3 binary to PCP_PYTHON_PROG
+	sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	    -e "s,python3 $PCP_PMDAS_DIR/mssql/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/mssql/,g" \
+	    -e "s,python $PCP_PMDAS_DIR/mssql/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/mssql/,g" \
+	# end
     fi
 fi
 

diff --git a/src/pmdas/nfsclient/Upgrade b/src/pmdas/nfsclient/Upgrade
@@ -23,7 +23,7 @@ then
     then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else
-	# convert hard-coded python  or pythont binary to PCP_PYTHON_PROG
+	# convert hard-coded python or python3 binary to PCP_PYTHON_PROG
 	sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
 	    -e "s,python3 $PCP_PMDAS_DIR/nfsclient/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/nfsclient/,g" \
 	    -e "s,python $PCP_PMDAS_DIR/nfsclient/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/nfsclient/,g" \
@@ -32,7 +32,8 @@ then
     if grep -q '^nfsclient.*perl ' "$PCP_PMCDCONF_PATH"
     then
 	# convert original perl implementation to python
-        sed -i -e "s,perl $PCP_PMDAS_DIR/nfsclient/pmdanfsclient.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/nfsclient/pmdanfsclient.python,g" $PCP_PMCDCONF_PATH 2>/dev/null
+	sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	    -e "s,perl $PCP_PMDAS_DIR/nfsclient/pmdanfsclient.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/nfsclient/pmdanfsclient.python,g"
     fi
 fi
 

diff --git a/src/pmdas/openmetrics/Upgrade b/src/pmdas/openmetrics/Upgrade
@@ -42,7 +42,11 @@ then
     then
 	:	# already using $PCP_PYTHON_PROG, leave this line untouched
     else
-	sed -i -e "s,python $PCP_PMDAS_DIR/openmetrics/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/openmetrics/,g" $PCP_PMCDCONF_PATH 2>/dev/null
+	# convert hard-coded python or python3 binary to PCP_PYTHON_PROG
+	sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	    -e "s,python3 $PCP_PMDAS_DIR/openmetrics/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/openmetrics/,g" \
+	    -e "s,python $PCP_PMDAS_DIR/openmetrics/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/openmetrics/,g" \
+	# end
     fi
 fi
 

diff --git a/src/pmdas/postgresql/Upgrade b/src/pmdas/postgresql/Upgrade
@@ -22,16 +22,20 @@ then
     if grep -q '^postgresql.*perl ' "$PCP_PMCDCONF_PATH" 2>/dev/null
     then
 	# convert original perl implementation to python
-	sed -i -e "s,perl $PCP_PMDAS_DIR/postgresql/pmdapostgresql.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/postgresql/pmdapostgresql.python,g" $PCP_PMCDCONF_PATH 2>/dev/null
+	sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+	    -e "s,perl $PCP_PMDAS_DIR/postgresql/pmdapostgresql.pl,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/postgresql/pmdapostgresql.python,g"
     fi
     if grep -q '^postgresql.*python ' "$PCP_PMCDCONF_PATH" 2>/dev/null
     then
 	if grep '^postgresql.*python ' "$PCP_PMCDCONF_PATH" | grep -q "$PCP_PYTHON_PROG" 2>/dev/null
 	then
 	    :	# already using $PCP_PYTHON_PROG, leave this line untouched
-        else
+	else
 	    # convert hard-coded python binary to PCP_PYTHON_PROG
-	    sed -i -e "s,python $PCP_PMDAS_DIR/postgresql/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/postgresql/,g" $PCP_PMCDCONF_PATH 2>/dev/null
+	    sed -i $PCP_PMCDCONF_PATH 2>/dev/null \
+		-e "s,python3 $PCP_PMDAS_DIR/postgresql/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/postgresql/,g" \
+		-e "s,python $PCP_PMDAS_DIR/postgresql/,$PCP_PYTHON_PROG $PCP_PMDAS_DIR/postgresql/,g" \
+	    # end
 	fi
     fi
 fi