Fix more command parsing issues

.github/workflows/ci.yml

@@ -1,14 +1,10 @@
 name: CI
 
 on:
-  release:
-    types: [published]
   push:
     branches:
       - master
   pull_request:
-    branches:
-      - master
 #  schedule:
 #    - cron: '0 0 * * 1'
 
@@ -54,22 +50,3 @@ jobs:
         $HOME/.r2env/bin/r2 -v
     - name: Uninstalling
       run: sudo pip uninstall -y r2env && rm -rf $HOME/.r2env
-  release-job:
-    name: Publish package
-    runs-on: ubuntu-20.04
-    needs: [integration-tests, flake8, pylint]
-    if: github.event_name == 'release' && github.event.action == 'published'
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - name: Install Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements/dist.txt
-      - name: Build
-        run: python setup.py sdist
-      - name: Publish
-        uses: pypa/gh-action-pypi-publish@release/v1
-        with:
-          user: __token__
-          password: ${{ secrets.TWINE_PASSWORD }}

.gitignore

@@ -1,8 +1,3 @@
 .idea
 **/__pycache__/
 venv
-.DS_Store
-AUTHORS
-ChangeLog
-dist/*
-r2env.egg-info

Makefile

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

r2env/config/profiles.json

@@ -21,15 +21,7 @@
       {
         "id": "5.3.1",
         "packages:": {
-          "w64": "radare2-5.3.1-w64.zip",
-          "deb_x64": "radare2_5.3.1_amd64.deb"
-        }
-      },
-      {
-        "id": "5.4.0",
-        "packages:": {
-          "w64": "radare2-5.4.0-w64.zip",
-          "deb_x64": "radare2_5.4.0_amd64.deb"
+
         }
       },
       {

r2env/package_manager.py

@@ -94,7 +94,7 @@ class PackageManager:
     def _build_using_acr(source_path, dst_path, logfile):
         """Only works in Unix systems"""
         exit_if_not_exists(['make'])
-        print_console("[-] Building package using acr...")
+        print_console("[-] Building package using acr for Termux...")
         extra_flags = ""
         if os.path.isfile("/default.prop"):
             extra_flags = " --with-compiler=termux"

requirements/dist.txt

@@ -1,5 +0,0 @@
--r build.txt
-pip
-pbr
-setuptools
-twine

setup.cfg

@@ -1,12 +1,11 @@
 [metadata]
 license_file = LICENSE
+version = 0.2.2
 name = r2env
-author = pancake
-# author_email = '[email protected], [email protected]'
-author_email = [email protected]
+author = 'pancake, murphy'
+author_email = '[email protected], [email protected]'
 description = radare2 multiple version and environment installation tool
 long_description = file:README.md
-long_description_content_type = text/markdown
 url = https://www.radare.org/
 project_urls =
     Source = https://github.com/radareorg/r2env