From 924d864e3e1252e6c5a8555a8ac578410a5a0f9b Mon Sep 17 00:00:00 2001 From: Pratham Bande Date: Wed, 28 Jan 2026 18:14:39 +0530 Subject: [PATCH 1/2] Checking activate script inside venv before activation --- src/startupscriptgenerator/src/python/scriptgenerator.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/startupscriptgenerator/src/python/scriptgenerator.go b/src/startupscriptgenerator/src/python/scriptgenerator.go index 995c1a7635..adc36c728a 100644 --- a/src/startupscriptgenerator/src/python/scriptgenerator.go +++ b/src/startupscriptgenerator/src/python/scriptgenerator.go @@ -209,7 +209,7 @@ func (gen *PythonStartupScriptGenerator) getPackageSetupCommand() string { scriptBuilder.WriteString(" echo WARNING: Could not find virtual environment directory '" + virtualEnvDir + "'.\n") } } else { - scriptBuilder.WriteString(fmt.Sprintf("echo '. /%s/bin/activate' >> ~/.bashrc\n", virtualEnvironmentName)) + scriptBuilder.WriteString(fmt.Sprintf("echo 'if [ -f /%s/bin/activate ]; then . /%s/bin/activate; fi' >> ~/.bashrc\n", virtualEnvironmentName, virtualEnvironmentName)) compressedFile := gen.Manifest.CompressedVirtualEnvFile virtualEnvDir := "/" + virtualEnvironmentName if strings.HasSuffix(compressedFile, ".zip") { @@ -290,7 +290,7 @@ func (gen *PythonStartupScriptGenerator) getVenvHandlingScript(virtualEnvName st scriptBuilder.WriteString(fmt.Sprintf(". %s/bin/activate\n", virtualEnvName)) } } else { - scriptBuilder.WriteString(fmt.Sprintf(". /%s/bin/activate\n", virtualEnvName)) + scriptBuilder.WriteString(fmt.Sprintf("if [ -f /%s/bin/activate ]; then . /%s/bin/activate; fi\n", virtualEnvName, virtualEnvName)) } } From d3708487887da4a802c34250d68b5dfab47b8e9c Mon Sep 17 00:00:00 2001 From: Pratham Bande Date: Wed, 28 Jan 2026 18:47:57 +0530 Subject: [PATCH 2/2] using virtualenv dir instead of hard slash --- src/startupscriptgenerator/src/python/scriptgenerator.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/startupscriptgenerator/src/python/scriptgenerator.go b/src/startupscriptgenerator/src/python/scriptgenerator.go index adc36c728a..4699e00f6d 100644 --- a/src/startupscriptgenerator/src/python/scriptgenerator.go +++ b/src/startupscriptgenerator/src/python/scriptgenerator.go @@ -209,9 +209,9 @@ func (gen *PythonStartupScriptGenerator) getPackageSetupCommand() string { scriptBuilder.WriteString(" echo WARNING: Could not find virtual environment directory '" + virtualEnvDir + "'.\n") } } else { - scriptBuilder.WriteString(fmt.Sprintf("echo 'if [ -f /%s/bin/activate ]; then . /%s/bin/activate; fi' >> ~/.bashrc\n", virtualEnvironmentName, virtualEnvironmentName)) - compressedFile := gen.Manifest.CompressedVirtualEnvFile virtualEnvDir := "/" + virtualEnvironmentName + scriptBuilder.WriteString(fmt.Sprintf("echo 'if [ -f %s/bin/activate ]; then . %s/bin/activate; fi' >> ~/.bashrc\n", virtualEnvDir, virtualEnvDir)) + compressedFile := gen.Manifest.CompressedVirtualEnvFile if strings.HasSuffix(compressedFile, ".zip") { scriptBuilder.WriteString("echo Found virtual environment .zip archive.\n") scriptBuilder.WriteString( @@ -290,7 +290,7 @@ func (gen *PythonStartupScriptGenerator) getVenvHandlingScript(virtualEnvName st scriptBuilder.WriteString(fmt.Sprintf(". %s/bin/activate\n", virtualEnvName)) } } else { - scriptBuilder.WriteString(fmt.Sprintf("if [ -f /%s/bin/activate ]; then . /%s/bin/activate; fi\n", virtualEnvName, virtualEnvName)) + scriptBuilder.WriteString(fmt.Sprintf("if [ -f %s/bin/activate ]; then . %s/bin/activate; fi\n", virtualEnvDir, virtualEnvDir)) } }