From 822e377383f1016a30d550d4a20f4bc0af92099c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20M=C3=A4rkl?= <info@florianmaerkl.de>
Date: Tue, 8 Dec 2020 17:27:54 +0100
Subject: [PATCH] Revert Temporary Changes (#2496)

---
 .appveyor.yml              | 5 -----
 .github/workflows/ccpp.yml | 2 --
 .gitmodules                | 4 ++--
 dist/CMakeLists.txt        | 2 +-
 scripts/rz-ghidra.sh       | 5 ++---
 5 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 67212e6f..47891e68 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -15,11 +15,6 @@ environment:
   PACKAGE_NAME: cutter-git-x64.Windows
 
 install:
-  - ps: $fileContent = "-----BEGIN RSA PRIVATE KEY-----`n"
-  - ps: $fileContent += $env:priv_key.Replace(' ', "`n")
-  - ps: $fileContent += "`n-----END RSA PRIVATE KEY-----`n"
-  - ps: Set-Content $env:userprofile\.ssh\id_rsa $fileContent
-  # --
   - ps: $env:path = ($env:path -split ";").Where({!($_ -like "*Microsoft SQL Server*")}) -join ";"
   - cmd: C:\msys64\usr\bin\bash -lc "cd $APPVEYOR_BUILD_FOLDER && scripts/fetch_deps.sh"
   - cmd: set "CUTTER_DEPS=%APPVEYOR_BUILD_FOLDER%\cutter-deps"
diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 022c846b..e5a8e3d5 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -29,7 +29,6 @@ jobs:
     steps:
     - uses: actions/checkout@v2
       with:
-        token: ${{ secrets.RIZIN_TOKEN }} # TODO: remove when the repo is public
         submodules: recursive
         persist-credentials: false
     - name: apt dependencies
@@ -86,7 +85,6 @@ jobs:
           export PKG_CONFIG_PATH="$CUTTER_DEPS_PYTHON_PREFIX/lib/pkgconfig:${PKG_CONFIG_PATH:-}"
           export LD_LIBRARY_PATH="`llvm-config --libdir`:$LD_LIBRARY_PATH"
         fi
-        set -euo pipefail #TODO: move to top once cutter-deps doesn't fail
         if [[ "${{ matrix.cc-override }}" != "default" ]]
         then
           export CC="${{matrix.cc-override}}"
diff --git a/.gitmodules b/.gitmodules
index d3aa0d85..52bebc1c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "rizin"]
 	path = rizin
-	url = git@github.com:rizinorg/rizin
+	url = https://github.com/rizinorg/rizin
 [submodule "src/translations"]
 	path = src/translations
-	url = git@github.com:rizinorg/cutter-translations
+	url = https://github.com/rizinorg/cutter-translations
diff --git a/dist/CMakeLists.txt b/dist/CMakeLists.txt
index 1321d33e..1d88bcf4 100644
--- a/dist/CMakeLists.txt
+++ b/dist/CMakeLists.txt
@@ -84,7 +84,7 @@ if(CUTTER_PACKAGE_RZ_GHIDRA)
 		# That way rz-ghidra build process is the same as with any other external plugin built against
 		# installed Cutter.
 		ExternalProject_Add(rz-ghidra
-			GIT_REPOSITORY git@github.com:rizinorg/rz-ghidra
+			GIT_REPOSITORY https://github.com/rizinorg/rz-ghidra
 			GIT_TAG master
 			CONFIGURE_COMMAND ""
 			BUILD_COMMAND ""
diff --git a/scripts/rz-ghidra.sh b/scripts/rz-ghidra.sh
index 81a5a334..2f255112 100755
--- a/scripts/rz-ghidra.sh
+++ b/scripts/rz-ghidra.sh
@@ -7,10 +7,9 @@ SCRIPTPATH=$(realpath "$(dirname "${BASH_SOURCE[0]}")")
 cd "$SCRIPTPATH/.."
 
 if [[ ! -d rz-ghidra ]]; then
-    # remove depth, branch and uncomment lines bellow to use specifc commit
+    # remove depth, branch and uncomment lines below to use specifc commit
 
-    git clone --recurse-submodules git@github.com:rizinorg/rz-ghidra.git  --depth 1  --branch master || exit 1
-    # git clone --recurse-submodules https://github.com/rizinorg/rz-ghidra.git  --depth 1  --branch master || exit 1
+    git clone --recurse-submodules https://github.com/rizinorg/rz-ghidra.git --depth 1 --branch master || exit 1
 
     #pushd rz-ghidra
     #git checkout  --recurse-submodules 5e845f4b50e8559bd51af03b22b6586e8cc5c35c