addftool 0.2.15__py3-none-any.whl → 0.2.16__py3-none-any.whl

addftool/deploy/vscode_server.py

@@ -1,7 +1,7 @@
 from addftool.util import need_sudo, execute_command, install_packages
 
 
-def deploy_vscode_server(install_tunnel=True):
+def deploy_vscode_server(install_tunnel=True, install_method="wget"):
     """
     Deploy Visual Studio Code and optionally start VS Code Tunnel.
     
@@ -9,29 +9,40 @@ def deploy_vscode_server(install_tunnel=True):
         install_tunnel (bool): Whether to start VS Code Tunnel after installation
     """
     command_prefix = "sudo " if need_sudo() else ""
-    
-    # Install prerequisites
-    print("Installing prerequisites...")
-    execute_command(command_prefix + "apt-get install -y wget gpg")
-    
-    # Add Microsoft's GPG key
-    print("Adding Microsoft's GPG key...")
-    execute_command("wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg")
-    execute_command(command_prefix + "install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg")
-    
-    # Add VS Code repository
-    print("Adding VS Code repository...")
-    execute_command(command_prefix + "sh -c 'echo \"deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] "
-                   "https://packages.microsoft.com/repos/code stable main\" > /etc/apt/sources.list.d/vscode.list'")
-    
-    # Clean up
-    execute_command("rm -f packages.microsoft.gpg")
-    
-    # Install VS Code
-    print("Installing VS Code...")
-    execute_command(command_prefix + "apt install -y apt-transport-https")
-    execute_command(command_prefix + "apt update")
-    execute_command(command_prefix + "apt install -y code")
+    if install_method == "apt":
+        # Install prerequisites
+        print("Installing prerequisites...")
+        execute_command(command_prefix + "apt-get install -y wget gpg")
+        
+        # Add Microsoft's GPG key
+        print("Adding Microsoft's GPG key...")
+        execute_command("wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg")
+        execute_command(command_prefix + "install -D -o root -g root -m 644 packages.microsoft.gpg /etc/apt/keyrings/packages.microsoft.gpg")
+        
+        # Add VS Code repository
+        print("Adding VS Code repository...")
+        execute_command(command_prefix + "sh -c 'echo \"deb [arch=amd64,arm64,armhf signed-by=/etc/apt/keyrings/packages.microsoft.gpg] "
+                    "https://packages.microsoft.com/repos/code stable main\" > /etc/apt/sources.list.d/vscode.list'")
+        
+        # Clean up
+        execute_command("rm -f packages.microsoft.gpg")
+        
+        # Install VS Code
+        print("Installing VS Code...")
+        execute_command(command_prefix + "apt install -y apt-transport-https")
+        execute_command(command_prefix + "apt update")
+        execute_command(command_prefix + "apt install -y code")
+    else:
+        # check if wget is installed
+        print("Checking if wget is installed...")
+        install_packages(["wget"])
+        # wget https://go.microsoft.com/fwlink/?LinkID=760868 -O /tmp/vscode-server.deb
+        # sudo DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades /tmp/vscode-server.deb
+        print("Downloading VS Code .deb package...")
+        execute_command("wget https://go.microsoft.com/fwlink/?LinkID=760868 -O /tmp/vscode-server.deb")
+        print("Installing VS Code from .deb package...")
+        execute_command(command_prefix + "DEBIAN_FRONTEND=noninteractive apt-get install -y --allow-downgrades /tmp/vscode-server.deb")
+        execute_command("rm -f /tmp/vscode-server.deb")
     
     # Start VS Code Tunnel if requested
     if install_tunnel:
@@ -50,6 +61,8 @@ def add_deploy_vscode_server_args(parser):
     """
     parser.add_argument("--no-tunnel", dest="install_tunnel", action="store_false", 
                         help="Skip starting VS Code Tunnel after installation")
+    parser.add_argument("--install_method", type=str, default="wget", choices=["apt", "wget"],
+                        help="Method to install VS Code (default: wget)")
     parser.set_defaults(install_tunnel=True)
 
 
@@ -60,7 +73,7 @@ def deploy_vscode_server_main(args):
     Args:
         args: Parsed command-line arguments
     """
-    deploy_vscode_server(install_tunnel=args.install_tunnel)
+    deploy_vscode_server(install_tunnel=args.install_tunnel, install_method=args.install_method)
 
 
 if __name__ == "__main__":

{addftool-0.2.15.dist-info → addftool-0.2.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: addftool
-Version: 0.2.15
+Version: 0.2.16
 Requires-Dist: cryptography
 Requires-Dist: requests
 Requires-Dist: PyYAML

{addftool-0.2.15.dist-info → addftool-0.2.16.dist-info}/RECORD

@@ -9,12 +9,12 @@ addftool/util.py,sha256=zlNLu8Be8cGIpNRqBw8_0q7nFxWlsJ9cToN62ohjdXE,2335
 addftool/deploy/__init__.py,sha256=UL8b-Idt7lStlMiOm8oTZ65fdzYz99Fgzq2Gaw8WsZc,1544
 addftool/deploy/azure.py,sha256=_o_9Eh8cVwLDAqvfyRYBtQRHs_Gul-nCs2ZXttwO1bk,1301
 addftool/deploy/ssh_server.py,sha256=7glpJJNROskpqPkeYrTc2MbVzRendUZLv-ZgPs6HCq8,5641
-addftool/deploy/vscode_server.py,sha256=tLtSvlcK2fEOaw6udWt8dNELVhwv9F59hF5DJJ-1Nak,2666
+addftool/deploy/vscode_server.py,sha256=VNH4i5PTa1FH2Yk1S95fNCJEzwe380GAj5vc-h7cdWk,3740
 addftool/process/__init__.py,sha256=Dze8OrcyjQlAbPrjE_h8bMi8W4b3OJyZOjTucPrkJvM,3721
 addftool/process/utils.py,sha256=JldxnwanLJOgxaPgmCJh7SeBRaaj5rFxWWxh1hpsvbA,2609
 addftool/ssh/__init__.py,sha256=h5_rCO0A6q2Yw9vFguQZZp_ApAJsT1dcnKnbKKZ0cDM,4409
-addftool-0.2.15.dist-info/METADATA,sha256=MNHj48rJ5avJsWZ7x6mN7m4vX-7C8d9EOpICgeIb9Gk,221
-addftool-0.2.15.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-addftool-0.2.15.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
-addftool-0.2.15.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
-addftool-0.2.15.dist-info/RECORD,,
+addftool-0.2.16.dist-info/METADATA,sha256=7nrWr3OjjsF48YajTsvjLi_MXJbf1zUBXfifVu-RYP8,221
+addftool-0.2.16.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+addftool-0.2.16.dist-info/entry_points.txt,sha256=9lkmuWMInwUAtev8w8poNkNd7iML9Bjd5CBCFVxg2b8,111
+addftool-0.2.16.dist-info/top_level.txt,sha256=jqj56-plrBbyzY0tIxB6wPzjAA8kte4hUlajyyQygN4,9
+addftool-0.2.16.dist-info/RECORD,,

{addftool-0.2.15.dist-info → addftool-0.2.16.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any