Release 0.5.9

.github/workflows/semgrep.yml

@@ -0,0 +1,23 @@
+on:
+  pull_request: {}
+  push:
+    branches:
+    - main
+    - master
+    paths:
+    - .github/workflows/semgrep.yml
+  schedule:
+  # random HH:MM to avoid a load spike on GitHub Actions at 00:00
+  - cron: 34 10 * * *
+name: Semgrep
+jobs:
+  semgrep:
+    name: Scan
+    runs-on: ubuntu-20.04
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+    container:
+      image: returntocorp/semgrep
+    steps:
+    - uses: actions/checkout@v3
+    - run: semgrep ci

Makefile

@@ -7,7 +7,9 @@ all:
 pub:
 	rm -rf dist
 	$(PYTHON) setup.py sdist
-	twine upload --repository=pypi --verbose dist/*
+	twine check dist/*
+	twine upload -u __token__ --repository-url https://upload.pypi.org/legacy/ --verbose dist/*
+	#twine upload --repository=pypi --verbose dist/*
 
 install:
 	$(PIP) install .

r2env/__main__.py

@@ -0,0 +1,3 @@
+from r2env.repl import main
+
+main()

r2env/package_manager.py

@@ -122,6 +122,10 @@ class PackageManager:
                 'source': 'https://github.com/wargio/r2dec-js',
                 'versions': [{'id': 'git', 'packages': {}}]
             },
+            'r2yara': {
+                'source': 'https://github.com/radareorg/r2yara',
+                'versions': [{'id': 'git', 'packages': {}}]
+            },
             'r2ghidra': {
                 'source': 'https://github.com/radareorg/r2ghidra',
                 'versions': [{'id': 'git', 'packages': {}}]
@@ -152,11 +156,17 @@ class PackageManager:
             os.makedirs(source_path)
         if not os.path.isdir(dst_dir):
             os.makedirs(dst_dir)
-        self._exit_if_package_not_available(profile, version)
+        if self._if_package_not_available(profile, version):
+            if os.path.isdir(dst_dir):
+                shutil.rmtree(dst_dir)
+            raise PackageManagerException(
+                f"{profile}@{version} package not available. Use 'list' command to see available packages.")
         if use_dist:
             if self._install_from_dist(profile, version):
                 print_console(f"[*] Binary package {profile}@{version} installed successfully")
             else:
+                if os.path.isdir(dst_dir):
+                    shutil.rmtree(dst_dir)
                 raise PackageManagerException(f"[x] Failed to install {profile}@{version}.")
         else:
             if self._build_from_source(profile, version, source_path, dst_dir, logfile, use_meson=use_meson):
@@ -188,11 +198,12 @@ class PackageManager:
             raise PackageManagerException(f"[x] Unable to find installed package {package_name}")
 
     def _get_pkgname(self, profile, version, cos):
-        for pkgv in self._packages[profile]["versions"]:
-            if pkgv["id"] == version:
-                for pkgd in pkgv["packages"].keys():
-                    if pkgd == cos:
-                        return pkgv["packages"][pkgd]
+        if profile in self._packages:
+            for pkgv in self._packages[profile]["versions"]:
+                if pkgv["id"] == version:
+                    for pkgd in pkgv["packages"].keys():
+                        if pkgd == cos:
+                            return pkgv["packages"][pkgd]
         return None
 
     def _get_disturl(self, profile, version, cos):
@@ -317,12 +328,9 @@ class PackageManager:
         print_console(f"Executing {cmd}")
         return os.system(cmd) == 0
 
-    def _exit_if_package_not_available(self, profile, version):
-        pkg_found = False
-        for available_version in self._packages[profile]["versions"]:
-            if available_version['id'] == version:
-                pkg_found = True
-                break
-        if not pkg_found:
-            raise PackageManagerException(
-                f"{profile}@{version} package not available. Use 'list' command to see available packages.")
+    def _if_package_not_available(self, profile, version):
+        if profile in self._packages:
+            for available_version in self._packages[profile]["versions"]:
+                if available_version['id'] == version:
+                    return False
+        return True

r2env/tools.py

@@ -81,7 +81,12 @@ def git_fetch(url, version, source_path):
                                       f"Verify the source path is not dirty. Error: {err}") \
             from err
     if version != "git":
-        repo.git.checkout(version)
+        try:
+            repo.git.checkout(version)
+        except git.GitCommandError:
+            # try again after pulling new tags from origin
+            repo.git.fetch("origin", "--tags")
+            repo.git.checkout(version)
     sms = repo.submodules
     for sm in sms:
         if not sm.module_exists():

r2env/version.txt

@@ -1 +1 @@
-0.5.6
+0.5.9