fix: cannot execute code --version in windows and linux
				
					
				
			This commit is contained in:
		@@ -28,7 +28,6 @@ export default class RemoteContainer {
 | 
			
		||||
        cancellable: false
 | 
			
		||||
      }, async (progress) => {
 | 
			
		||||
        try {
 | 
			
		||||
 | 
			
		||||
          if (password === undefined) {
 | 
			
		||||
            // connect with key
 | 
			
		||||
            await ssh.connect({
 | 
			
		||||
@@ -40,26 +39,28 @@ export default class RemoteContainer {
 | 
			
		||||
            progress.report({ message: "连接成功,开始安装" });
 | 
			
		||||
 | 
			
		||||
            // install vscode-server and devstar extension
 | 
			
		||||
            const vscodeCommitId = await utils.getVsCodeCommitId();
 | 
			
		||||
            const vscodeServerUrl = `https://vscode.download.prss.microsoft.com/dbazure/download/stable/${vscodeCommitId}/vscode-server-linux-x64.tar.gz`
 | 
			
		||||
            const installVscodeServerScript = `
 | 
			
		||||
          mkdir -p ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
          if [ "$(ls -A ~/.vscode-server/bin/${vscodeCommitId})" ]; then
 | 
			
		||||
              ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
          else
 | 
			
		||||
              wget ${vscodeServerUrl} -O vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
              mv vscode-server-linux-x64.tar.gz ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
              cd ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
              tar -xvzf vscode-server-linux-x64.tar.gz --strip-components 1 && \\
 | 
			
		||||
              rm vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
              ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
          fi
 | 
			
		||||
          `;
 | 
			
		||||
            await ssh.execCommand(installVscodeServerScript);
 | 
			
		||||
            console.log("vscode-server and extension installed");
 | 
			
		||||
            vscode.window.showInformationMessage('安装完成!');
 | 
			
		||||
            const vscodeCommitId = await utils.getVsCodeCommitId()
 | 
			
		||||
            if ("" != vscodeCommitId) {
 | 
			
		||||
              const vscodeServerUrl = `https://vscode.download.prss.microsoft.com/dbazure/download/stable/${vscodeCommitId}/vscode-server-linux-x64.tar.gz`
 | 
			
		||||
              const installVscodeServerScript = `
 | 
			
		||||
            mkdir -p ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
            if [ "$(ls -A ~/.vscode-server/bin/${vscodeCommitId})" ]; then
 | 
			
		||||
                ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
            else
 | 
			
		||||
                wget ${vscodeServerUrl} -O vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
                mv vscode-server-linux-x64.tar.gz ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
                cd ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
                tar -xvzf vscode-server-linux-x64.tar.gz --strip-components 1 && \\
 | 
			
		||||
                rm vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
                ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
            fi
 | 
			
		||||
            `;
 | 
			
		||||
              await ssh.execCommand(installVscodeServerScript);
 | 
			
		||||
              console.log("vscode-server and extension installed");
 | 
			
		||||
              vscode.window.showInformationMessage('安装完成!');
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            await ssh.dispose();
 | 
			
		||||
              await ssh.dispose();
 | 
			
		||||
          } else {
 | 
			
		||||
            // connect with password (deprecate in future)
 | 
			
		||||
            await ssh.connect({
 | 
			
		||||
@@ -71,35 +72,27 @@ export default class RemoteContainer {
 | 
			
		||||
            progress.report({ message: "连接成功,开始安装" });
 | 
			
		||||
 | 
			
		||||
            // install vscode-server and devstar extension
 | 
			
		||||
            const vscodeCommitId = await utils.getVsCodeCommitId();
 | 
			
		||||
            const vscodeServerUrl = `https://vscode.download.prss.microsoft.com/dbazure/download/stable/${vscodeCommitId}/vscode-server-linux-x64.tar.gz`
 | 
			
		||||
            const installVscodeServerScript = `
 | 
			
		||||
          mkdir -p ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
          if [ "$(ls -A ~/.vscode-server/bin/${vscodeCommitId})" ]; then
 | 
			
		||||
              ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
          else
 | 
			
		||||
              wget ${vscodeServerUrl} -O vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
              mv vscode-server-linux-x64.tar.gz ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
              cd ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
              tar -xvzf vscode-server-linux-x64.tar.gz --strip-components 1 && \\
 | 
			
		||||
              rm vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
              ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
          fi
 | 
			
		||||
          `;
 | 
			
		||||
            await ssh.execCommand(installVscodeServerScript);
 | 
			
		||||
            console.log("vscode-server and extension installed");
 | 
			
		||||
            vscode.window.showInformationMessage('安装完成!');
 | 
			
		||||
 | 
			
		||||
            // add the public key to the remote authorized_keys
 | 
			
		||||
            if (!utils.existDefaultPublicKey() || !utils.existDefaultPrivateKey()) {
 | 
			
		||||
              // if there is no public key, generate one
 | 
			
		||||
              utils.createSSHKey()
 | 
			
		||||
            const vscodeCommitId = await utils.getVsCodeCommitId()
 | 
			
		||||
            if ("" != vscodeCommitId) {
 | 
			
		||||
              const vscodeServerUrl = `https://vscode.download.prss.microsoft.com/dbazure/download/stable/${vscodeCommitId}/vscode-server-linux-x64.tar.gz`
 | 
			
		||||
              const installVscodeServerScript = `
 | 
			
		||||
            mkdir -p ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
            if [ "$(ls -A ~/.vscode-server/bin/${vscodeCommitId})" ]; then
 | 
			
		||||
                ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
            else
 | 
			
		||||
                wget ${vscodeServerUrl} -O vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
                mv vscode-server-linux-x64.tar.gz ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
                cd ~/.vscode-server/bin/${vscodeCommitId} && \\
 | 
			
		||||
                tar -xvzf vscode-server-linux-x64.tar.gz --strip-components 1 && \\
 | 
			
		||||
                rm vscode-server-linux-x64.tar.gz && \\
 | 
			
		||||
                ~/.vscode-server/bin/${vscodeCommitId}/bin/code-server --install-extension mengning.devstar
 | 
			
		||||
            fi
 | 
			
		||||
            `;
 | 
			
		||||
              await ssh.execCommand(installVscodeServerScript);
 | 
			
		||||
              console.log("vscode-server and extension installed");
 | 
			
		||||
              vscode.window.showInformationMessage('安装完成!');
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            const publicKey = utils.getDefaultPublicKey();
 | 
			
		||||
            await ssh.execCommand(`mkdir -p ~/.ssh && echo '${publicKey}' >> ~/.ssh/authorized_keys`);
 | 
			
		||||
            console.log('Public key added to remote authorized_keys');
 | 
			
		||||
 | 
			
		||||
            await ssh.dispose();
 | 
			
		||||
          }
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user