remove old support information

.gitignore

@@ -0,0 +1,7 @@
+bin
+build
+.gradle
+.vscode
+.settings
+.classpath
+.project

README.md

@@ -1,12 +1,12 @@
-# ADB-Installer
+# Android Debug Bridge Installer
 Download from [Releases](https://github.com/josephsmendoza/ADB-Installer/releases)
 
 This is a re-implementation of the [15 seconds ADB Installer](https://forum.xda-developers.com/showthread.php?t=2588979)
 
 This installer requires an internet connection.
 
-Icon is from [Google via icon-icons.com](https://icon-icons.com/icon/adb/90476)
+Icon is from [material.io](https://material.io/resources/icons/?icon=bug_report&style=baseline)
 
-Windows version packaged with [Ptiso](https://pismotec.com/ptiso/)
+Windows version packaged with [7zip](https://www.7-zip.org/)
 
-Linux & Mac version packaged with [UPX](https://upx.github.io/)
+Linux & Mac version packaged with [makeself](https://makeself.io/)

adbi.d

@@ -1,130 +0,0 @@
-/+ dub.sdl:
-targetPath "bin/$PLATFORM/$ARCH"
-+/
-
-import std.path;
-import std.stdio : writeln;
-import std.algorithm.searching : canFind;
-import std.process : environment;
-
-bool sys,user,silent,verbose;
-string installDir;
-
-int installTools(){
-	import std.zip,std.conv,std.file,std.net.curl,std.conv : octal;
-
-	version(Windows) string url="https://dl.google.com/android/repository/platform-tools-latest-windows.zip";
-	version(OSX) string url="https://dl.google.com/android/repository/platform-tools-latest-darwin.zip";
-	version(linux) string url="https://dl.google.com/android/repository/platform-tools-latest-linux.zip";
-
-	ubyte[] data;
-	auto http=HTTP(url);
-	http.onReceive=(ubyte[] response){
-		data~=response;
-		return response.length;
-	};
-	http.perform();
-	"Download complete".writeln();
-	
-	auto zip=new ZipArchive(data);
-	foreach (x;zip.directory){
-		auto path=buildNormalizedPath(installDir,x.name[15 .. $]);
-		if(x.compressedSize!=0){
-			if(!path.dirName.exists) path.dirName.mkdirRecurse();
-			if(path.exists) path.remove();
-			zip.expand(x);
-			write(path, x.expandedData);
-			setAttributes(path,octal!775);
-		} else {
-			try if(path.isFile) {
-				path.remove;
-				path.mkdirRecurse;
-			} catch (Exception e) path.mkdirRecurse;
-		}
-	}
-	"Extraction complete".writeln();
-	return 0;
-}
-
-int installPath(){
-	string path=environment.get("PATH");
-	if(path.canFind(installDir)){
-		"Install folder is already in PATH".writeln;
-		return 0;
-	}
-
-	version(Windows){
-		import std.windows.registry;
-		Key env;
-		if(user){
-			env=Registry.currentUser.getKey("Environment",REGSAM.KEY_ALL_ACCESS);
-		}
-		if(sys){
-			env=Registry.localMachine.getKey("SYSTEM").getKey("CurrentControlSet")
-				.getKey("Control").getKey("Session Manager").getKey("Environment",REGSAM.KEY_ALL_ACCESS);
-		}
-		path=env.getValue("Path").value_SZ;
-		path~=pathSeparator~installDir;
-		env.setValue("Path",path);
-		//import core.sys.windows.winuser; SendNotifyMessageW(HWND_BROADCAST,WM_SETTINGCHANGE,cast(ulong)null,cast(long)"Environment");
-	} else {
-		import std.file : append;
-		if(user) append("~/.profile".expandTilde,"\nexport PATH=$PATH"~pathSeparator~installDir);
-		if(sys) append("/etc/profile","\nexport PATH=$PATH"~pathSeparator~installDir);
-	}
-
-	"Install folder was added to PATH".writeln();
-	"logout/login or reboot to coplete install".writeln();
-	return 0;
-}
-
-int install(){
-	if(user) "Installing for current user".writeln();
-	if(sys) "Installing for all users".writeln();
-	("Installing to " ~ installDir).writeln();
-	return installTools() + installPath();
-}
-
-int main(string[] args){
-
-	import std.getopt : getopt,defaultGetoptPrinter;
-
-	auto xargs=getopt(args,
-	"all-users|a","Install for all users.",&sys,
-	"user|u","Install for current user.",&user,
-	//"silent|s","Silent standard output.",&silent,
-	//"verbose|v","Verbose standard output.",&verbose,
-	"install-dir|i","Install to specified directory",&installDir
-	);
-
-	if(installDir){
-		installDir=installDir.buildNormalizedPath.absolutePath;
-		if(!sys && !user){
-			string allHome="~".expandTilde.dirName;
-			if(!allHome.isRooted && installDir.canFind(allHome)) user=true;
-			else sys=true;
-		}
-		return install();
-	}
-
-	if(user || sys){
-		auto append=buildNormalizedPath("Android","SDK","platform-tools");
-
-		if(user){
-			version(Windows)installDir=buildNormalizedPath(environment.get("LocalAppData"),append);
-			version(linux)installDir=buildNormalizedPath("~".expandTilde,append);
-			version(OSX)installDir=buildNormalizedPath("~/Library".expandTilde,append);
-			return install();
-		}
-
-		if(sys){
-			version(Windows)installDir=buildNormalizedPath(environment.get("ProgramFiles"),append);
-			version(linux)installDir=buildNormalizedPath("/opt",append);
-			version(OSX)installDir=buildNormalizedPath("/Library",append);
-			return install();
-		}
-	}
-
-	defaultGetoptPrinter("Download platform-tools and add to PATH.",xargs.options);
-	return 0;
-}

bin/windows/x86_64/adbi.cmd

@@ -1,3 +0,0 @@
-@echo off
-%~dp0\adbi.exe %*
-pause

build.cmd

@@ -1,2 +0,0 @@
-dub build --single adbi.d
-ptiso create -z lzma -c crc32 -x stub ptse_cmd.stub -x runas admin -x mount_system_visible 0 -x process_visible 1 -x run_relative 1 -x use_stderr 1 -x run_exe adbi.cmd -x icon adb.ico ADB-Installer.exe bin/windows/x86_64

build.gradle

@@ -0,0 +1,36 @@
+plugins {
+	id 'java'
+	id 'application'
+	id "org.beryx.runtime" version "1.8.0" //https://plugins.gradle.org/plugin/org.beryx.runtime
+}
+sourceSets.main.java.srcDirs = ['src']
+application.mainClassName = 'gui'
+repositories {
+	jcenter()
+	mavenCentral()
+	google()
+	maven { url 'https://jitpack.io' }
+}
+dependencies {
+	implementation 'info.picocli:picocli:4.2.0'
+}
+runtime {
+    options = ['--strip-debug','--no-header-files','--no-man-pages']
+    modules = ['java.desktop','jdk.crypto.ec']
+}
+task sfx(type: Exec,dependsOn: "runtime"){
+	int complevel=1
+	workingDir runtime.imageDir
+	String dest="../"+application.applicationName
+	if(System.getProperty("os.name").toLowerCase().startsWith("win")){
+		doFirst{
+			new File("build/image/setup.bat").text="@echo off\ncall bin/"+applicationName+".bat"
+		}
+		String stub="7zs2con.sfx"
+		executable "7z"
+		args "a",dest,"-mx"+complevel,"-sfx"+stub
+	}else{
+		executable "makeself"
+		args "--complevel",complevel,".",dest+".sh",application.applicationName,"bin/adbi"
+	}
+}

build.sh

@@ -1,3 +0,0 @@
-#!/bin/sh
-dub build --single adbi.d
-upx --best bin/linux/x86_64/adbi

cli.d

@@ -1,3 +0,0 @@
-/+ dub.sdl
-sourceFiles "adbi.d"
-+/

gui.d

@@ -1,30 +0,0 @@
-/+ dub.sdl:
-dependency "tkd" version="1.1.13"
-targetPath "bin/$PLATFORM/$ARCH"
-copyFiles \
-	"$TCLTK_PACKAGE_DIR/dist/$ARCH/tcl86t.dll" \
-	"$TCLTK_PACKAGE_DIR/dist/$ARCH/tk86t.dll" \
-	"$TCLTK_PACKAGE_DIR/dist/library" \
-	platform="windows"
-+/
-
-import tkd.tkdapplication;                               
-
-class GUI : TkdApplication                       
-{
-	override protected void initInterface()              
-	{
-		auto frame = new Frame().pack(5);
-		new Label(frame, "Select an install location").pack(0);
-		auto searchLabel=new Label(frame,"Searching for pre-existing files...").pack(0);
-		new Button(frame, "System").pack(0);
-		new Button(frame, "User").pack(0);
-		new Button(frame, "Mixed").pack(0);
-	}
-}
-
-void main(string[] args)
-{
-	auto gui = new GUI();
-	gui.run();
-}

src/adbi.java

@@ -0,0 +1,189 @@
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardOpenOption;
+import java.nio.file.attribute.PosixFilePermissions;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public class adbi {
+
+    private final String os;
+
+    public adbi() throws Exception {
+        switch (System.getProperty("os.name").substring(0, 3).toLowerCase()) {
+            case "win": {
+                os = "windows";
+                break;
+            }
+            case "mac": {
+                os = "darwin";
+                break;
+            }
+            case "lin": {
+                os = "linux";
+                break;
+            }
+            default: {
+                throw new Exception("unknown os");
+            }
+        }
+
+    }
+
+    public String getHome() {
+        if (os == "windows") {
+            return System.getenv("HOMEPATH");
+        } else {
+            return System.getenv("HOME");
+        }
+    }
+
+    public boolean isPathPrivileged(String path) {
+        return path.startsWith(getHome());
+    }
+
+    public String getCannonicalPath(String path) {
+        return Paths.get(path).toAbsolutePath().normalize().toString();
+    }
+
+    public String getDefaultInstallPath(boolean privileged) {
+        String append = "/Android/SDK/platform-tools";
+        if (privileged) {
+            switch (os) {
+                case "windows": {
+                    return System.getenv("programfiles") + append;
+                }
+                case "darwin": {
+                    return "/Library" + append;
+                }
+                default: {
+                    return "/opt" + append;
+                }
+            }
+        } else {
+            switch (os) {
+                case "windows": {
+                    return System.getenv("localappdata") + append;
+                }
+                case "darwin": {
+                    return System.getenv("HOME") + "/Library" + append;
+                }
+                default: {
+                    return System.getenv("HOME") + append;
+                }
+            }
+        }
+    }
+
+    private InputStream getUrlStream() throws MalformedURLException, IOException {
+        return new URL("https://dl.google.com/android/repository/platform-tools-latest-" + os + ".zip").openStream();
+    }
+
+    private boolean isNeeded(String name, int mode) {
+        switch (mode) {
+            case (1): {
+                if (name.startsWith("fastboot"))
+                    return true;
+            }
+            case (0): {
+                return name.toLowerCase().startsWith("adb");
+            }
+            default: {
+                return true;
+            }
+        }
+    }
+
+    public void download(String dir, int mode) throws MalformedURLException, IOException {
+        ZipInputStream zInputStream = new ZipInputStream(getUrlStream());
+        ZipEntry zEntry = zInputStream.getNextEntry();
+        while (zEntry != null) {
+            String name = zEntry.getName().substring(15);
+            if (isNeeded(name, mode) && zEntry.getSize() > 0) {
+                Path dest = Paths.get(dir, name);
+                Files.createDirectories(dest.getParent());
+                Files.write(dest, zInputStream.readAllBytes());
+                if (os != "windows") {
+                    Files.setPosixFilePermissions(dest, PosixFilePermissions.fromString("755"));
+                }
+            }
+            zEntry = zInputStream.getNextEntry();
+        }
+    }
+
+    public void install(String dir, boolean privileged) throws Exception {
+        if (System.getenv("PATH").contains(dir)) {
+            return;
+        }
+        if (os == "windows") {
+            installWindows(dir, privileged);
+        } else {
+            installPosix(dir, privileged);
+        }
+    }
+
+    private void installPosix(String dir, boolean privileged) throws IOException {
+        Path profile = getProfilePath(privileged);
+        String path = "export PATH=$PATH:\"" + dir + "\"";
+        if (Files.exists(profile) && Files.readAllLines(profile).add(path)) {
+            Files.writeString(profile, "\n" + path, StandardOpenOption.APPEND);
+        } else {
+            Files.writeString(profile, path);
+        }
+    }
+
+    private Path getProfilePath(boolean privileged) {
+        if (privileged) {
+            return Paths.get("/etc/profile");
+        } else {
+            Path home = Paths.get(System.getenv("HOME"));
+            if (os == "darwin") {
+                return home.resolve(".bash_profile");
+            } else {
+                return home.resolve(".bashrc");
+            }
+        }
+    }
+
+    private void installWindows(String dir, boolean privileged) throws Exception {
+        String type = "REG_EXPAND_SZ";
+        String valueName = "Path";
+        String keyName = getKeyName(privileged);
+
+        String path = regQuery(keyName, valueName, type);
+        if (path.contains(dir)) {
+            return;
+        }
+        regAdd(keyName, valueName, type, path + ";" + dir + ";");
+    }
+
+    private void regAdd(String keyName, String valueName, String type, String data) throws Exception {
+        Process p = Runtime.getRuntime()
+                .exec(new String[] { "reg", "add", keyName, "/v", valueName, "/t", type, "/d", data, "/f" });
+        if (p.waitFor() != 0) {
+            throw new Exception(new String(p.getErrorStream().readAllBytes()));
+        }
+    }
+
+    private String regQuery(String keyName, String valueName, String type) throws Exception {
+        Process p = Runtime.getRuntime().exec(new String[] { "reg", "query", keyName, "/v", valueName });
+        if (p.waitFor() != 0) {
+            throw new Exception(new String(p.getErrorStream().readAllBytes()));
+        }
+        return new String(p.getInputStream().readAllBytes()).replace(keyName, "").replace(valueName, "")
+                .replace(type, "").trim();
+    }
+
+    private String getKeyName(boolean privileged) {
+        if (privileged) {
+            return "HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Session Manager\\Environment";
+        } else {
+            return "HKEY_CURRENT_USER\\Environment";
+        }
+    }
+}

src/cli.java

@@ -0,0 +1,64 @@
+import picocli.CommandLine;
+import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
+import picocli.CommandLine.ParseResult;
+
+@Command(name = "adbi", description = "install adb", mixinStandardHelpOptions = true, version = "beta")
+public class cli implements Runnable {
+    @Option(names = { "-i", "--install-dir" }, description = "directory to install to")
+    String dir;
+    @Option(names = { "-u", "--user-mode" }, description = "unpriveleged install, current user only")
+    boolean user;
+    @Option(names = { "-f", "--add-fastboot" }, description = "include fastboot")
+    boolean fastboot;
+    @Option(names = { "-a", "--add-all" }, description = "include everything")
+    boolean all;
+    @Option(names = { "-d", "--download-only" }, description = "do not try to add adb to PATH")
+    boolean downloadOnly;
+
+    public static void main(String[] args) {
+        new cli(args).run();
+    }
+
+    public cli(String[] args) {
+        CommandLine cli = new CommandLine(this);
+        ParseResult argv = cli.parseArgs(args);
+        if (argv.isUsageHelpRequested()) {
+            cli.usage(System.err);
+            System.exit(0);
+        }
+        if (argv.isVersionHelpRequested()) {
+            cli.printVersionHelp(System.err);
+            System.exit(0);
+        }
+    }
+
+    @Override
+    public void run() {
+        int mode = 0;
+        if (fastboot)
+            mode += 1;
+        if (all)
+            mode += 2;
+        try {
+            adbi adbi = new adbi();
+            if (dir == null)
+                dir = adbi.getDefaultInstallPath(!user);
+            else{
+                if(!user && !adbi.isPathPrivileged(dir)){
+                    user=true;
+                    System.out.println("User directory specified, switching to user mode");
+                }
+            }
+            dir = adbi.getCannonicalPath(dir);
+            adbi.download(dir, mode);
+            if (!downloadOnly) {
+                adbi.install(dir, !user);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            System.exit(e.hashCode());
+        }
+
+    }
+}

src/gui.java

@@ -0,0 +1,137 @@
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.LayoutManager;
+import java.io.File;
+
+import javax.swing.ButtonGroup;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JFileChooser;
+import javax.swing.JFrame;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.UIManager;
+
+public class gui extends JFrame {
+
+    private static final long serialVersionUID = -2628083151723078126L;
+    private final adbi adbi;
+    private final gui gui = this;
+    private final LayoutManager manager = new GridBagLayout();
+    private final GridBagConstraints constraints = new GridBagConstraints();
+    private final String title = "ADBi";
+    private final JComboBox<String> installPath = new JComboBox<String>();
+    private final JButton startButton = new JButton("Start");
+    private final JRadioButton adb = new JRadioButton("adb");
+    private final JRadioButton fastboot = new JRadioButton("adb and fastboot");
+    private final JRadioButton all = new JRadioButton("everything");
+    private final ButtonGroup components = new ButtonGroup();
+    private final JLabel componentsLabel = new JLabel("From platform-tools, install:");
+    private final JButton selectFolderButton = new JButton(UIManager.getIcon("FileView.directoryIcon"));
+    private final JLabel installPathLabel = new JLabel("Install to:");
+    private final JCheckBox download = new JCheckBox("Download/Update only, don't install");
+    private JFileChooser fileChooser = new JFileChooser();
+
+    public static void main(String[] args) {
+        try {
+            UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+            new gui();
+        } catch (Exception e) {
+            e.printStackTrace(System.err);
+            JOptionPane.showMessageDialog(null, e.getMessage(), e.getClass().getSimpleName(), JOptionPane.ERROR_MESSAGE);
+            System.exit(1);
+        }
+    }
+
+    public gui() throws Exception {
+        adbi = new adbi();
+        setDefaultCloseOperation(EXIT_ON_CLOSE);
+        setTitle(title);
+        setLayout(manager);
+
+        constraints.gridx = GridBagConstraints.RELATIVE;
+        constraints.gridy = 1;
+        constraints.fill = GridBagConstraints.HORIZONTAL;
+        add(installPath, constraints);
+
+        constraints.fill = GridBagConstraints.NONE;
+        add(selectFolderButton, constraints);
+
+        constraints.gridx = 0;
+        constraints.gridy = 0;
+        constraints.fill = GridBagConstraints.HORIZONTAL;
+        constraints.gridwidth = GridBagConstraints.REMAINDER;
+        add(installPathLabel, constraints);
+
+        constraints.gridy = 2;
+        add(componentsLabel, constraints);
+
+        constraints.gridy = GridBagConstraints.RELATIVE;
+        add(adb, constraints);
+        add(fastboot, constraints);
+        add(all, constraints);
+        add(download, constraints);
+        add(startButton, constraints);
+
+        components.add(adb);
+        components.add(fastboot);
+        components.add(all);
+        adb.setSelected(true);
+
+        installPath.addItem(adbi.getDefaultInstallPath(true));
+        installPath.addItem(adbi.getDefaultInstallPath(false));
+        installPath.setSelectedIndex(0);
+        installPath.setEditable(true);
+
+        pack();
+        selectFolderButton.addActionListener(l -> selectFolder());
+        startButton.addActionListener(l -> start());
+        setVisible(true);
+
+        fileChooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
+    }
+
+    private void start() {
+        JPanel statusPanel = new JPanel(manager);
+        JLabel statusLabel = new JLabel("Setting up");
+        statusPanel.add(statusLabel, constraints);
+        gui.setContentPane(statusPanel);
+        int x = 0;
+        if (fastboot.isSelected())
+            x += 1;
+        if (all.isSelected())
+            x += 2;
+        final int mode = x;
+        final String dir = adbi.getCannonicalPath((String) installPath.getSelectedItem());
+        final boolean privileged = adbi.isPathPrivileged(dir);
+        new Thread(() -> {
+            try {
+                statusLabel.setText("Downloading");
+                adbi.download(dir, mode);
+                if (!download.isSelected()) {
+                    statusLabel.setText("Installing");
+                    adbi.install(dir, privileged);
+                }
+                JOptionPane.showMessageDialog(gui, "Done", "ADBi", JOptionPane.INFORMATION_MESSAGE);
+                System.exit(0);
+            } catch (Exception e) {
+                e.printStackTrace(System.err);
+                JOptionPane.showMessageDialog(gui, e.getMessage() + "\n" + e.getClass().getSimpleName(),
+                        "Install Failed", JOptionPane.ERROR_MESSAGE);
+                System.exit(1);
+            }
+        }).start();
+    }
+
+    private void selectFolder() {
+        fileChooser.showOpenDialog(gui);
+        try{
+        installPath.setSelectedItem(fileChooser.getSelectedFile().getAbsolutePath());
+        }catch(NullPointerException e){
+            //non-issue
+        }
+    }
+}