From 1f61a4e8bf589b143f6ce3b7193db1c7e9f30584 Mon Sep 17 00:00:00 2001
From: fedy95 <fedy95@protonmail.com>
Date: Fri, 5 Mar 2021 19:25:24 +0300
Subject: [PATCH] update ides

---
 roles/ide_goland/tasks/main.yml   | 40 +++++++++++++++++--------------
 roles/ide_goland/vars/main.yml    |  2 +-
 roles/ide_phpstorm/tasks/main.yml | 38 ++++++++++++++++-------------
 roles/ide_phpstorm/vars/main.yml  |  2 +-
 4 files changed, 45 insertions(+), 37 deletions(-)

diff --git a/roles/ide_goland/tasks/main.yml b/roles/ide_goland/tasks/main.yml
index 519b0d0..a72e1df 100644
--- a/roles/ide_goland/tasks/main.yml
+++ b/roles/ide_goland/tasks/main.yml
@@ -1,42 +1,46 @@
 ---
 
-- name: Test if folder exist
+- name: Check opt artifacts exist
   stat:
-    path: "{{ goland_bin }}"
-  register: goland_exist
+    path: "/opt/goland-{{ goland_version }}"
+  register: goland_artifacts
 
 - name: Download
   get_url:
-    url: http://download.jetbrains.com/go/ide_goland-{{ goland_version }}.tar.gz
-    dest: /opt/ide_goland-{{ goland_version }}.tar.gz
-  when: goland_exist.stat.exists == False
+    url: http://download.jetbrains.com/go/goland-{{ goland_version }}.tar.gz
+    dest: /opt/goland-{{ goland_version }}.tar.gz
+  when: goland_artifacts.stat.exists == False
 
 - name: Create folder
   file:
-    path: /opt/ide_goland-{{ goland_version }}
+    path: /opt/goland-{{ goland_version }}
     state: directory
-  when: goland_exist.stat.exists == False
+  when: goland_artifacts.stat.exists == False
 
 - name: Decompress
   unarchive:
-    src: /opt/ide_goland-{{ goland_version }}.tar.gz
-    dest: /opt/ide_goland-{{ goland_version }}
+    src: /opt/goland-{{ goland_version }}.tar.gz
+    dest: /opt/goland-{{ goland_version }}
     extra_opts: [ --strip-component=1 ]
-  when: goland_exist.stat.exists == False
+  when: goland_artifacts.stat.exists == False
 
 - name: Create symlink
   file:
-    src: /opt/ide_goland-{{ goland_version }}/bin/ide_goland.sh
+    src: /opt/goland-{{ goland_version }}/bin/goland.sh
     dest: "{{ goland_bin }}"
     state: link
-  when: goland_exist.stat.exists == False
+  when: goland_bin.stat.exists == False
+
+
+- name: Check binary exist
+  stat:
+    path: "{{ goland_bin }}"
+  register: goland_bin
 
 - name: Remove archive
-  file:
-    path: /opt/ide_goland-{{ goland_version }}.tar.gz
-    state: absent
-  when: goland_exist.stat.exists == False
+  shell: rm -r /opt/goland-{{ goland_version }}.tar.gz
+  when: goland_version.stat.exists == False
 
 - name: Init start (Create Desktop Entry)
   command: sh {{ goland_bin }}
-  when: goland_exist.stat.exists == False
+  when: goland_bin.stat.exists == False
diff --git a/roles/ide_goland/vars/main.yml b/roles/ide_goland/vars/main.yml
index 35c057d..2e069d2 100644
--- a/roles/ide_goland/vars/main.yml
+++ b/roles/ide_goland/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 
-goland_bin: "/usr/local/bin/ide_goland"
+goland_bin: "/usr/local/bin/goland"
 goland_version: "2020.3.3"
diff --git a/roles/ide_phpstorm/tasks/main.yml b/roles/ide_phpstorm/tasks/main.yml
index 2d60b1d..b502dc0 100644
--- a/roles/ide_phpstorm/tasks/main.yml
+++ b/roles/ide_phpstorm/tasks/main.yml
@@ -1,42 +1,46 @@
 ---
 
-- name: Test if folder exist
+- name: Check opt artifacts exist
   stat:
-    path: "{{ phpstorm_bin }}"
-  register: phpstorm_exist
+    path: "/opt/phpstorm-{{ phpstorm_version }}"
+  register: phpstorm_artifacts
 
 - name: Download
   get_url:
     url: http://download.jetbrains.com/webide/PhpStorm-{{ phpstorm_version }}.tar.gz
-    dest: /opt/ide_phpstorm-{{ phpstorm_version }}.tar.gz
-  when: phpstorm_exist.stat.exists == False
+    dest: /opt/phpstorm-{{ phpstorm_version }}.tar.gz
+  when: phpstorm_artifacts.stat.exists == False
 
 - name: Create folder
   file:
-    path: /opt/ide_phpstorm-{{ phpstorm_version }}
+    path: /opt/phpstorm-{{ phpstorm_version }}
     state: directory
-  when: phpstorm_exist.stat.exists == False
+  when: phpstorm_artifacts.stat.exists == False
 
 - name: Decompress
   unarchive:
-    src: /opt/ide_phpstorm-{{ phpstorm_version }}.tar.gz
-    dest: /opt/ide_phpstorm-{{ phpstorm_version }}
+    src: /opt/phpstorm-{{ phpstorm_version }}.tar.gz
+    dest: /opt/phpstorm-{{ phpstorm_version }}
     extra_opts: [ --strip-component=1 ]
-  when: phpstorm_version.stat.exists == False
+  when: phpstorm_artifacts.stat.exists == False
 
 - name: Create symlink
   file:
-    src: /opt/ide_phpstorm-{{ phpstorm_version }}/bin/ide_phpstorm.sh
+    src: /opt/phpstorm-{{ phpstorm_version }}/bin/phpstorm.sh
     dest: "{{ phpstorm_bin }}"
     state: link
-  when: phpstorm_exist.stat.exists == False
+  when: phpstorm_artifacts.stat.exists == False
+
+
+- name: Test if folder exist
+  stat:
+    path: "{{ phpstorm_bin }}"
+  register: phpstorm_bin
 
 - name: Remove archive
-  file:
-    path: /opt/ide_phpstorm-{{ phpstorm_version }}.tar.gz
-    state: absent
-  when: phpstorm_exist.stat.exists == False
+  shell: rm -r /opt/phpstorm-{{ phpstorm_version }}.tar.gz
+  when: phpstorm_bin.stat.exists == False
 
 - name: Init start (Create Desktop Entry)
   command: sh {{ phpstorm_bin }}
-  when: phpstorm_exist.stat.exists == False
+  when: phpstorm_bin.stat.exists == False
diff --git a/roles/ide_phpstorm/vars/main.yml b/roles/ide_phpstorm/vars/main.yml
index 70f73bc..06144da 100644
--- a/roles/ide_phpstorm/vars/main.yml
+++ b/roles/ide_phpstorm/vars/main.yml
@@ -1,4 +1,4 @@
 ---
 
-phpstorm_bin: "/usr/local/bin/ide_phpstorm"
+phpstorm_bin: "/usr/local/bin/phpstorm"
 phpstorm_version: "2020.3.2"