Ubuntu 22.04 Fixes

ehcp/ehcpforceupdate.sh

@@ -3313,6 +3313,7 @@ function fixSQMailPerms(){
 }
 
 function installPipManuallyIfNeeded(){
+	aptgetInstall "python-pip"
 	curDir=$(pwd)
 	
 	# Create a symlink for python if one doesn't exist
@@ -3322,6 +3323,11 @@ function installPipManuallyIfNeeded(){
 		fi
 	fi
 	
+	# Create a symlink for python pip 2 if one doesn't exist
+	if [ ! -e "/usr/bin/pip" ] && [ -e "/usr/bin/pip2" ]; then
+		ln -s "/usr/bin/pip2" "/usr/bin/pip"
+	fi
+	
 	# Install pip if it's not found on the system manually
 	currentPip=$(which pip)
 	if [ -z "$currentPip" ]; then
@@ -3692,6 +3698,9 @@ echo -e "Restarting web services, synchronizing domains, and finalizing installa
 # Start the services and sync domains
 finalize
 
+# Make sure python2 pip is installed
+installPipManuallyIfNeeded
+
 # Write out version info with current info in case anything has changed
 echo -e "Writing out versioning information!\n"
 writeOutVersionInfo

ehcp/install_main.sh

@@ -3015,6 +3015,7 @@ function fixSQMailPerms(){
 }
 
 function installPipManuallyIfNeeded(){
+	aptgetInstall "python-pip"
 	curDir=$(pwd)
 	
 	# Create a symlink for python if one doesn't exist
@@ -3024,6 +3025,11 @@ function installPipManuallyIfNeeded(){
 		fi
 	fi
 	
+	# Create a symlink for python pip 2 if one doesn't exist
+	if [ ! -e "/usr/bin/pip" ] && [ -e "/usr/bin/pip2" ]; then
+		ln -s "/usr/bin/pip2" "/usr/bin/pip"
+	fi
+	
 	# Install pip if it's not found on the system manually
 	currentPip=$(which pip)
 	if [ -z "$currentPip" ]; then
@@ -3324,6 +3330,9 @@ postInstallInformation
 # Run final cleanup
 finalCleanup
 
+# Make sure python2 pip is installed
+installPipManuallyIfNeeded
+
 # Launch firefox and the panel
 ##############################################
 launchPanel