diff --git a/post.go b/post.go
index b1facea..6f6857d 100644
--- a/post.go
+++ b/post.go
@@ -480,9 +480,9 @@ func installAgy() {
 
 func pnpmEnvPrefix() string {
 	if isMacOS {
-		return `export PNPM_HOME="$HOME/Library/pnpm" && export PATH="$PNPM_HOME:$PATH" && `
+		return `export PNPM_HOME="$HOME/Library/pnpm"; export PATH="$PNPM_HOME/bin:$PNPM_HOME:$PATH"; `
 	}
-	return `export PNPM_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/pnpm" && export PATH="$PNPM_HOME:$PATH" && `
+	return `export PNPM_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/pnpm"; export PATH="$PNPM_HOME/bin:$PNPM_HOME:$PATH"; `
 }
 
 func installNpmPackage(pkgName string) {
@@ -493,7 +493,7 @@ func installNpmPackage(pkgName string) {
 	}
 	ensureNodeLTS()
 	fmt.Printf("  Installing %s via pnpm ...\n", pkgName)
-	cmd := fmt.Sprintf(`bash -c "%ssource ~/.nvm/nvm.sh && pnpm add -g %s"`, pnpmEnvPrefix(), pkgName)
+	cmd := fmt.Sprintf(`bash -c '%ssource ~/.nvm/nvm.sh && pnpm add -g %s'`, pnpmEnvPrefix(), pkgName)
 	if !runShell(cmd, CmdOpts{}).OK() {
 		errLog(fmt.Sprintf("%s installation failed", pkgName))
 	}
@@ -507,7 +507,7 @@ func installPlaywright() {
 	}
 	ensureNodeLTS()
 	fmt.Println("  Installing playwright via pnpm ...")
-	addCmd := fmt.Sprintf(`bash -c "%ssource ~/.nvm/nvm.sh && pnpm add -g playwright"`, pnpmEnvPrefix())
+	addCmd := fmt.Sprintf(`bash -c '%ssource ~/.nvm/nvm.sh && pnpm add -g playwright'`, pnpmEnvPrefix())
 	if !runShell(addCmd, CmdOpts{}).OK() {
 		errLog("playwright installation failed")
 		return
@@ -519,7 +519,7 @@ func installPlaywright() {
 	} else {
 		fmt.Println("  Installing Playwright browsers ...")
 	}
-	if !runShell(fmt.Sprintf(`bash -c "%ssource ~/.nvm/nvm.sh && %s"`, pnpmEnvPrefix(), installCmd), CmdOpts{}).OK() {
+	if !runShell(fmt.Sprintf(`bash -c '%ssource ~/.nvm/nvm.sh && %s'`, pnpmEnvPrefix(), installCmd), CmdOpts{}).OK() {
 		errLog("playwright browser installation failed")
 	}
 }