Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/startupscriptgenerator/src/python/scriptgenerator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 '. /%s/bin/activate' >> ~/.bashrc\n", 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(
Expand Down Expand Up @@ -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", virtualEnvDir, virtualEnvDir))
}
}

Expand Down
Loading