From e06bad274bc60ec520bae8b69205ebe3ab9be360 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:46:10 +0100
Subject: [PATCH 01/23] Publish apk to Apps template

---
 templates/gitlab-ci-publish-app.yml | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 templates/gitlab-ci-publish-app.yml

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
new file mode 100644
index 0000000..24c1203
--- /dev/null
+++ b/templates/gitlab-ci-publish-app.yml
@@ -0,0 +1,32 @@
+
+image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
+
+.publish to apps:
+  stage: publish
+  variables:
+    APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
+  script:
+  - |
+    echo "$APP_JSON"
+
+    curl -k -i \
+      -H 'Content-Type: application/json' \
+      -H "Accept: application/json" \
+      -X POST -d "$APP_JSON" \
+       https://updates.ecloud.global:8443/push.php
+
+#include:
+#  - project: 'e/apps/docker-android-apps-cicd'
+#    ref: master
+#    file: '/templates/.gitlab-ci-publish-app.yml'
+#apps:
+#  extends: .publish to apps
+#  variables:
+#    APP_NAME: "Light"
+#    APP_AUTHOR: "eFoundation"
+#    APP_PACKAGE_NAME: "foundation.e.foundation"
+#    APP_ICON_PATH: ""
+#    APP_CATEGORY: "default_app"
+#    APP_DESCRIPTION: "light app"
+#    APP_LICENSE: "Apache 2.0"
+#    APP_VERSION_NUMBER: "4.1.0"
-- 
GitLab


From d274a2fd8d4e799fe1c16af4d2759b2b8f921f8f Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 15 Feb 2019 14:55:39 +0100
Subject: [PATCH 02/23] Avoid to build when templates are modified

---
 .gitlab-ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 39894e9..16ab88f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -16,3 +16,6 @@ build_image:
     - docker build --cache-from $CONTAINER_IMAGE:latest -t $CONTAINER_IMAGE -t $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME .
     - docker push $CONTAINER_IMAGE:$CI_COMMIT_REF_NAME
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi
+  except:
+    changes:
+      - templates/
-- 
GitLab


From 825aae9ee24d03d9dea6b5b67e1b13baba3e2ee1 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 10:45:02 +0100
Subject: [PATCH 03/23] Add parameters

---
 templates/gitlab-ci-publish-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 24c1203..51deb62 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -13,7 +13,7 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
       -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
       -X POST -d "$APP_JSON" \
-       https://updates.ecloud.global:8443/push.php
+       https://updates.ecloud.global:8443/push.php?t=modify&k=mysecretkey
 
 #include:
 #  - project: 'e/apps/docker-android-apps-cicd'
-- 
GitLab


From f39ca3bcaa4a34a9ff6450be8cd32cb19b6c699c Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 10:48:32 +0100
Subject: [PATCH 04/23] Fix except

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 16ab88f..628b699 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,4 +18,4 @@ build_image:
     - if [ "${CI_COMMIT_REF_NAME}" = master ] ; then docker push $CONTAINER_IMAGE:latest ; fi
   except:
     changes:
-      - templates/
+      - templates/*
-- 
GitLab


From f4d1b4fc5cc0dcdda1215716e06c55c252463aaf Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 10:52:12 +0100
Subject: [PATCH 05/23] Fix templates

---
 templates/gitlab-ci-publish-app.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 51deb62..3c8991b 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -6,14 +6,13 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
   variables:
     APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
+  - echo "$APP_JSON"
   - |
-    echo "$APP_JSON"
-
-    curl -k -i \
+    curl -v -k -i \
       -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
       -X POST -d "$APP_JSON" \
-       https://updates.ecloud.global:8443/push.php?t=modify&k=mysecretkey
+       $URL
 
 #include:
 #  - project: 'e/apps/docker-android-apps-cicd'
@@ -30,3 +29,4 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
 #    APP_DESCRIPTION: "light app"
 #    APP_LICENSE: "Apache 2.0"
 #    APP_VERSION_NUMBER: "4.1.0"
+#    URL:
-- 
GitLab


From e2b243e3991cb2f3c20bc8745f2aee464b7478fd Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 10:55:28 +0100
Subject: [PATCH 06/23] No verbose

---
 templates/gitlab-ci-publish-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 3c8991b..7aeaa63 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -8,7 +8,7 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
   script:
   - echo "$APP_JSON"
   - |
-    curl -v -k -i \
+    curl -k -i \
       -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
       -X POST -d "$APP_JSON" \
-- 
GitLab


From 21d72ad40602224deb41c7cee8a518bd08c0b1c1 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 11:00:02 +0100
Subject: [PATCH 07/23] Add parameter

---
 templates/gitlab-ci-publish-app.yml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 7aeaa63..1ea48f0 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -7,11 +7,17 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
     APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
   script:
   - echo "$APP_JSON"
+  - echo "$KEY"
+  - echo "$TYPE"
+  - echo "$URL"
   - |
     curl -k -i \
       -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
-      -X POST -d "$APP_JSON" \
+      -X POST \
+      -d "$APP_JSON" \
+      -d "t=$TYPE"
+      -d "k=$KEY"\
        $URL
 
 #include:
-- 
GitLab


From a4375d6555b4c6aec2be619967f662d14d4c7585 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 11:01:15 +0100
Subject: [PATCH 08/23] Fix

---
 templates/gitlab-ci-publish-app.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 1ea48f0..f1fa9b2 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -16,8 +16,8 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
       -H "Accept: application/json" \
       -X POST \
       -d "$APP_JSON" \
-      -d "t=$TYPE"
-      -d "k=$KEY"\
+      -d "t=$TYPE" \
+      -d "k=$KEY" \
        $URL
 
 #include:
-- 
GitLab


From e341749460391d60f5dc09b947224b01f77d1e2e Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 11:23:07 +0100
Subject: [PATCH 09/23] Add data

---
 templates/gitlab-ci-publish-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index f1fa9b2..613672e 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -15,7 +15,7 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
       -H 'Content-Type: application/json' \
       -H "Accept: application/json" \
       -X POST \
-      -d "$APP_JSON" \
+      -d "data=$APP_JSON" \
       -d "t=$TYPE" \
       -d "k=$KEY" \
        $URL
-- 
GitLab


From c745ee1c9fa0da34a21f9c00bfc82f67d0f6d2fd Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 11:25:46 +0100
Subject: [PATCH 10/23] Remove JSON

---
 templates/gitlab-ci-publish-app.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 613672e..d0d658a 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -12,8 +12,6 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
   - echo "$URL"
   - |
     curl -k -i \
-      -H 'Content-Type: application/json' \
-      -H "Accept: application/json" \
       -X POST \
       -d "data=$APP_JSON" \
       -d "t=$TYPE" \
-- 
GitLab


From 856cda6be6cd1aa6d2f850e8070b9587d2df69a5 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 17:16:56 +0100
Subject: [PATCH 11/23] Update process

---
 templates/gitlab-ci-publish-app.yml | 24 ++++++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index d0d658a..cad4436 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -11,12 +11,28 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
   - echo "$TYPE"
   - echo "$URL"
   - |
-    curl -k -i \
+    version=$APP_VERSION_NUMBER
+    version=$(echo $version | sed 's/(/_/g')
+    version=$(echo $version | sed 's/)/_/g')
+    version=$(echo $version | sed 's/ //g')
+    version=$(echo -n $(date +"%s").$version | md5sum | cut -d ' ' -f 1)
+
+    apk_name=$version"_"$APP_PACKAGE_NAME".apk";
+    icon_name=$version"_"$APP_PACKAGE_NAME".png";
+    APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
+  - |
+    scp $apk_name apk@apk.ecloud.global:/mnt/data/new_apk/
+    scp $icon_name updates@app.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/
+    sleep 90
+  - |
+    response=$(curl -k \
       -X POST \
       -d "data=$APP_JSON" \
       -d "t=$TYPE" \
       -d "k=$KEY" \
-       $URL
+       $URL)
+  - if ! echo $response | grep -q SUCC  ; then echo Failed ; exit 1 ; fi
+
 
 #include:
 #  - project: 'e/apps/docker-android-apps-cicd'
@@ -34,3 +50,7 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
 #    APP_LICENSE: "Apache 2.0"
 #    APP_VERSION_NUMBER: "4.1.0"
 #    URL:
+#    KEY:
+#    TYPE:
+#    APK_PATH:
+#    ICON_PATH
-- 
GitLab


From bca8d3f94a3b43eb9157cddefabc3ef6eeff5cbd Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 17:36:17 +0100
Subject: [PATCH 12/23] Fix icon and apk source

---
 templates/gitlab-ci-publish-app.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index cad4436..f62df21 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -21,8 +21,8 @@ image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
     icon_name=$version"_"$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
   - |
-    scp $apk_name apk@apk.ecloud.global:/mnt/data/new_apk/
-    scp $icon_name updates@app.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/
+    scp $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
+    scp $ICON_PATH updates@app.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
     sleep 90
   - |
     response=$(curl -k \
-- 
GitLab


From c452ca1ba451416fddaf04e6890292e4b2c4795a Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 21 Feb 2019 17:55:45 +0100
Subject: [PATCH 13/23] Fix Docker image used

---
 templates/gitlab-ci-publish-app.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index f62df21..4333392 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -1,7 +1,6 @@
 
-image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
-
 .publish to apps:
+  image: registry.gitlab.e.foundation:5000/e/tools/docker-tools:latest
   stage: publish
   variables:
     APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
-- 
GitLab


From 6bc9b88f194b26a7c19ab920c32891fa3aa0b1c2 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 09:34:55 +0100
Subject: [PATCH 14/23] Change icon name

---
 templates/gitlab-ci-publish-app.yml | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 4333392..8551031 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -4,6 +4,15 @@
   stage: publish
   variables:
     APP_JSON: '{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
+  before_script:
+    - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi
+    - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
+    - eval $(ssh-agent -s)
+    - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - mkdir -p ~/.ssh
+    - chmod 700 ~/.ssh
+    - echo "$PUBLISH_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
+    - chmod 644 ~/.ssh/known_hosts
   script:
   - echo "$APP_JSON"
   - echo "$KEY"
@@ -17,11 +26,11 @@
     version=$(echo -n $(date +"%s").$version | md5sum | cut -d ' ' -f 1)
 
     apk_name=$version"_"$APP_PACKAGE_NAME".apk";
-    icon_name=$version"_"$APP_PACKAGE_NAME".png";
+    icon_name=$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
   - |
     scp $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
-    scp $ICON_PATH updates@app.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
+    scp $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
     sleep 90
   - |
     response=$(curl -k \
-- 
GitLab


From 923e8e5ee05086a2b5d31f3dbb7118f843aac0c3 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 17:26:44 +0100
Subject: [PATCH 15/23] Split command

---
 templates/gitlab-ci-publish-app.yml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 8551031..fcbbd27 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -28,10 +28,9 @@
     apk_name=$version"_"$APP_PACKAGE_NAME".apk";
     icon_name=$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
-  - |
-    scp $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
-    scp $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
-    sleep 90
+  - scp $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
+  - scp $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
+  - sleep 90
   - |
     response=$(curl -k \
       -X POST \
-- 
GitLab


From 877389329ffaf8051d2e4d6314f7d0986385a88a Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 17:43:42 +0100
Subject: [PATCH 16/23] Test

---
 templates/gitlab-ci-publish-app.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index fcbbd27..83e4d20 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -28,8 +28,8 @@
     apk_name=$version"_"$APP_PACKAGE_NAME".apk";
     icon_name=$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
-  - scp $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
-  - scp $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
+  - scp -i ~/.ssh/id_rsa $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
+  - scp -i ~/.ssh/id_rsa $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
   - sleep 90
   - |
     response=$(curl -k \
-- 
GitLab


From de95e3926def35fe906a5e6e537c2fcf0dc820a1 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 17:51:33 +0100
Subject: [PATCH 17/23] ls ssh

---
 templates/gitlab-ci-publish-app.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 83e4d20..4cc783f 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -28,6 +28,7 @@
     apk_name=$version"_"$APP_PACKAGE_NAME".apk";
     icon_name=$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
+  - ls ~/.ssh
   - scp -i ~/.ssh/id_rsa $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
   - scp -i ~/.ssh/id_rsa $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
   - sleep 90
-- 
GitLab


From 3febffed35bdc21c70fc9886452c562a4d23ee50 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 18:06:39 +0100
Subject: [PATCH 18/23] Fix ssh

---
 templates/gitlab-ci-publish-app.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 4cc783f..4594d68 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -9,6 +9,7 @@
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)
     - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
     - echo "$PUBLISH_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
-- 
GitLab


From d7e10095b92622320599a368b5905c07a5333fee Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 18:12:31 +0100
Subject: [PATCH 19/23] Fix

---
 templates/gitlab-ci-publish-app.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 4594d68..6abb82a 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -8,10 +8,9 @@
     - if [ -d "/srv/userscripts" ]; then cp -R userscripts/* /srv/userscripts ; fi
     - 'which ssh-agent || ( apt-get update -y && apt-get install openssh-client -y )'
     - eval $(ssh-agent -s)
-    - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
-    - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
+    - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
     - echo "$PUBLISH_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-- 
GitLab


From e627f9a76bb5d1486b0a2d2445b7d51cb0d93454 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 18:17:15 +0100
Subject: [PATCH 20/23] Fix

---
 templates/gitlab-ci-publish-app.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index 6abb82a..f7388cd 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -11,6 +11,7 @@
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
     - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' | ssh-add - > /dev/null
+    - echo "$PUBLISH_SSH_PRIVATE_KEY" | tr -d '\r' > ~/.ssh/id_rsa
     - echo "$PUBLISH_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-- 
GitLab


From bc3627fe52a026c54290504acf844888122892f5 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 18:29:50 +0100
Subject: [PATCH 21/23] Comment scp to test API call

---
 templates/gitlab-ci-publish-app.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index f7388cd..d254555 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -30,8 +30,8 @@
     icon_name=$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
   - ls ~/.ssh
-  - scp -i ~/.ssh/id_rsa $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
-  - scp -i ~/.ssh/id_rsa $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
+#  - scp -i ~/.ssh/id_rsa $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
+#  - scp -i ~/.ssh/id_rsa $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
   - sleep 90
   - |
     response=$(curl -k \
-- 
GitLab


From 4ce679932e350d1d1af6668f8c88e8faa2063ff2 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Fri, 22 Feb 2019 18:30:58 +0100
Subject: [PATCH 22/23] Display json

---
 templates/gitlab-ci-publish-app.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/gitlab-ci-publish-app.yml b/templates/gitlab-ci-publish-app.yml
index d254555..1eeaa67 100644
--- a/templates/gitlab-ci-publish-app.yml
+++ b/templates/gitlab-ci-publish-app.yml
@@ -15,7 +15,6 @@
     - echo "$PUBLISH_SSH_KNOWN_HOSTS" > ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-  - echo "$APP_JSON"
   - echo "$KEY"
   - echo "$TYPE"
   - echo "$URL"
@@ -29,6 +28,7 @@
     apk_name=$version"_"$APP_PACKAGE_NAME".apk";
     icon_name=$APP_PACKAGE_NAME".png";
     APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
+  - echo "$APP_JSON"
   - ls ~/.ssh
 #  - scp -i ~/.ssh/id_rsa $APK_PATH apk@apk.ecloud.global:/mnt/data/new_apk/$apk_name
 #  - scp -i ~/.ssh/id_rsa $ICON_PATH updates@apps.ecloud.global:/root/scraper/scraper/spiders/apkpure_assets/default_apps/icon/$icon_name
-- 
GitLab


From 5c0c92e4113ac5ad8dc2a224c2c9f349b7dfa271 Mon Sep 17 00:00:00 2001
From: Romain Hunault <romain.hunault@eelo.io>
Date: Thu, 24 Oct 2019 11:16:39 +0200
Subject: [PATCH 23/23] tmp

---
 LICENCE           | 21 +++++++++++++++++++++
 templates/test.sh | 20 ++++++++++++++++++++
 2 files changed, 41 insertions(+)
 create mode 100644 LICENCE
 create mode 100755 templates/test.sh

diff --git a/LICENCE b/LICENCE
new file mode 100644
index 0000000..dcf3d69
--- /dev/null
+++ b/LICENCE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2017 Jan Grewe
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/templates/test.sh b/templates/test.sh
new file mode 100755
index 0000000..01870ec
--- /dev/null
+++ b/templates/test.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+APP_VERSION_NUMBER=4.1.0
+APP_PACKAGE_NAME="foundation.e.foundation"
+APP_JSON='{"name":"$APP_NAME","package_name":"$APP_PACKAGE_NAME","author":"$APP_AUTHOR","icon_image_path":"$APP_ICON_PATH","category":"$APP_CATEGORY","description":"$APP_DESCRIPTION","licence":"$APP_LICENSE","latest_version_number":"$APP_VERSION_NUMBER"}'
+
+version=$APP_VERSION_NUMBER
+version=$(echo $version | sed 's/(/_/g')
+version=$(echo $version | sed 's/)/_/g')
+version=$(echo $version | sed 's/ //g')
+version=$(echo -n $(date +"%s").$version | md5sum | cut -d ' ' -f 1)
+
+apk_name=$version"_"$APP_PACKAGE_NAME".apk";
+icon_name=$version"_"$APP_PACKAGE_NAME".png";
+APP_JSON=$(echo $APP_JSON | sed 's/}/,"apk_name":"'$apk_name'","icon_name":"'$icon_name'"}/')
+
+
+echo $apk_name
+echo $icon_name
+echo $APP_JSON
-- 
GitLab