changed the update function to expose the rev in the filename

gef.py

@@ -118,22 +118,18 @@ def http_get(url):
 def update_gef(argv):
     """Try to update `gef` to the latest version pushed on GitHub master branch.
     Return 0 on success, 1 on failure. """
-    gef_local = os.path.realpath(argv[0])
-    hash_gef_local = hashlib.sha512(open(gef_local, "rb").read()).digest()
-    gef_remote = "https://raw.githubusercontent.com/hugsy/gef/master/gef.py"
-    gef_remote_data = http_get(gef_remote)
-    if gef_remote_data is None:
+    ver = "dev" if "--dev" in argv[2:] else "master"
+    latest_gef_data = http_get("https://raw.githubusercontent.com/hugsy/gef/{}/scripts/gef.sh".format(ver,))
+    if latest_gef_data is None:
         print("[-] Failed to get remote gef")
         return 1
 
-    hash_gef_remote = hashlib.sha512(gef_remote_data).digest()
-    if hash_gef_local == hash_gef_remote:
-        print("[-] No update")
-    else:
-        with open(gef_local, "wb") as f:
-            f.write(gef_remote_data)
-        print("[+] Updated")
-    return 0
+    fd, fname = tempfile.mkstemp(suffix=".sh")
+    os.write(fd, latest_gef_data)
+    os.close(fd)
+    retcode = subprocess.run(["bash", fname, ver], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL).returncode
+    os.unlink(fname)
+    return retcode
 
 
 try:

scripts/gef.sh

@@ -1,6 +1,20 @@
+#!/bin/bash
 
-wget -q -O "$HOME/.gdbinit-gef.py" https://github.com/hugsy/gef/raw/master/gef.py
-test -f "$HOME/.gdbinit" && mv "$HOME/.gdbinit" "$HOME/.gdbinit.old"
-echo "source $HOME/.gdbinit-gef.py" > "$HOME/.gdbinit"
+set -e
 
-exit 0
+branch="master"
+test "$1" == "dev" && branch="dev"
+
+# Backup gdbinit if any
+test -f "${HOME}/.gdbinit" && mv "${HOME}/.gdbinit" "${HOME}/.gdbinit.old"
+
+# Get the hash of the commit
+ref=$(curl --silent https://api.github.com/repos/hugsy/gef/git/ref/heads/${branch} | grep '"sha"' | tr -s ' ' | cut -d ' ' -f 3 | tr -d "," | tr -d '"')
+
+# Download the file
+curl --silent --output "${HOME}/.gef-${ref}.py" "https://github.com/hugsy/gef/raw/${branch}/gef.py"
+
+# Create the new gdbinit
+echo "source ~/.gef-${ref}.py" > ~/.gdbinit
+
+exit 0

tests/runtests.py

@@ -607,16 +607,6 @@ def test_func_stack(self):
         self.assertRegex(res, r"\+0x0*20: *0x0000000000000000\n")
         return
 
-class TestGefMisc(GefUnitTestGeneric):
-    """Tests external functionality."""
-
-    def test_update(self):
-        tempdir = tempfile.mkdtemp()
-        update_gef = os.path.join(tempdir, "gef.py")
-        subprocess.call(["cp", "/tmp/gef.py", update_gef])
-        status = subprocess.call(["python3", update_gef, "--update"])
-        self.assertEqual(status, 0)
-
 
 def run_tests(name=None):