Skip to content

Add new store icon for aurora #550

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BenStarmerSmith wants to merge 3 commits into
base: master
Choose a base branch
from
+111 −18
Open

Add new store icon for aurora #550

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0467e43
Removed un-needed args.
BenStarmerSmith Jun 26, 2023
92bdd0a
Added store icon.
BenStarmerSmith Jun 27, 2023
2d46932
Merge branch 'master' into F#_SP-920_add_new_pack_position
BenStarmerSmith Jun 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
129 changes: 111 additions & 18 deletions ansible/roles/products/common/demo-icons/tasks/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@
- name: Make Close Right Hand desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Close Right Hand.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when: bimanual|bool or hand_side=="right"
Expand Down Expand Up @@ -111,8 +109,6 @@
- name: Make Close Left Hand desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Close Left Hand.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when: bimanual|bool or hand_side=="left"
Expand Down Expand Up @@ -150,8 +146,117 @@
- name: Make Close bimanual Hands desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Close Bimanual Hands.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when: bimanual|bool

- name: Install right hand store hand icon if bimanual is true or if hand_side="right"
Copy link
Collaborator

@devops-shadow devops-shadow Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you updated the tests to test this icon creation (and the script)

block:
- name: Copy Store Right Hand desktop icon
copy:
src: ../../../common/resources/files/close-hand-icon-right.png
dest: "{{ shadow_hand_launcher_folder }}/close-hand-icon-right.png"
mode: '664'

- name: Create Store Right Hand executable launch script
template:
src: ../resources/templates/scripts/rosrun-script.j2
dest: "{{ shadow_hand_launcher_folder }}/store_right_hand.sh"
mode: '755'
vars:
project_name: sr_demos
script_name: store.py --side right

- name: Create Store Right Hand desktop icon
template:
src: ../resources/templates/desktop-icons/standard-icon.j2
dest: "{{ demo_icon_folder }}/Store Right Hand.desktop"
mode: '755'
vars:
desktop_shortcut_name: Store Right Hand
comment: "This icon runs a script to put the Hand into a position where it can be stored for transportation. Hand needs to be running."
folder: "{{ shadow_hand_launcher_folder }}"
shell_script_file_name: store_right_hand.sh
Copy link
Collaborator

@devops-shadow devops-shadow Jun 29, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the this file

icon_file_name: close-hand-icon-right.png
start_terminal: "false"

- name: Make Store Right Hand desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Store Right Hand.desktop" "metadata::trusted" yes
when:
- not skip_molecule_task|bool

when: bimanual|bool or hand_side=="right"

- name: Install left hand store hand icon if bimanual is true or if hand_side="left"
block:
- name: Copy Store Left Hand desktop icon
copy:
src: ../../../common/resources/files/close-hand-icon-left.png
dest: "{{ shadow_hand_launcher_folder }}/close-hand-icon-left.png"
mode: '664'

- name: Create Store Left Hand executable launch script
template:
src: ../resources/templates/scripts/rosrun-script.j2
dest: "{{ shadow_hand_launcher_folder }}/store_left_hand.sh"
mode: '755'
vars:
project_name: sr_demos
script_name: store.py --side left

- name: Create Store Left Hand desktop icon
template:
src: ../resources/templates/desktop-icons/standard-icon.j2
dest: "{{ demo_icon_folder }}/Store Left Hand.desktop"
mode: '755'
vars:
desktop_shortcut_name: Store Left Hand
comment: "This icon runs a script to put the Hand into a position where it can be stored for transportation. Hand needs to be running."
folder: "{{ shadow_hand_launcher_folder }}"
shell_script_file_name: store_left_hand.sh
icon_file_name: close-hand-icon-left.png
start_terminal: "false"

- name: Make Store Left Hand desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Store Left Hand.desktop" "metadata::trusted" yes
when:
- not skip_molecule_task|bool

when: bimanual|bool or hand_side=="left"

- name: Install bimanual hands store hand icon if bimanual is true
block:
- name: Copy Store Bimanual Hands desktop icon
copy:
src: ../../../common/resources/files/close-hand-icon-bimanual.png
dest: "{{ shadow_hand_launcher_folder }}/close-hand-icon-bimanual.png"
mode: '664'

- name: Create store bimanual Hands executable launch script
template:
src: ../resources/templates/scripts/rosrun-script.j2
dest: "{{ shadow_hand_launcher_folder }}/store_bimanual_hands.sh"
mode: '755'
vars:
project_name: sr_demos
script_name: store.py --side both

- name: Create Store Bimanual Hands desktop icon
template:
src: ../resources/templates/desktop-icons/standard-icon.j2
dest: "{{ demo_icon_folder }}/Store Bimanual Hands.desktop"
mode: '755'
vars:
desktop_shortcut_name: Store Bimanual Hands
comment: "This icon runs a script to put the Hand into a position where it can be stored for transportation. Hand needs to be running."
folder: "{{ shadow_hand_launcher_folder }}"
shell_script_file_name: store_bimanual_hands.sh
icon_file_name: close-hand-icon-bimanual.png
start_terminal: "false"

- name: Make Store bimanual Hands desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Store Bimanual Hands.desktop" "metadata::trusted" yes
when:
- not skip_molecule_task|bool

when: bimanual|bool
Expand Down Expand Up @@ -189,8 +294,6 @@
- name: Make Open Right Hand desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}/Open Right Hand.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when: bimanual|bool or hand_side=="right"
Expand Down Expand Up @@ -228,8 +331,6 @@
- name: Make Open Left Hand desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}//Open Left Hand.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when: bimanual|bool or hand_side=="left"
Expand Down Expand Up @@ -267,8 +368,6 @@
- name: Make Open Bimanual Hands desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}//Open Bimanual Hands.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when: bimanual|bool == true
Expand Down Expand Up @@ -307,8 +406,6 @@
- name: Make Standard Right Demo desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}//Demo Right Hand.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when:
Expand Down Expand Up @@ -348,8 +445,6 @@
- name: Make Standard Left Demo desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}//Demo Left Hand.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when:
Expand Down Expand Up @@ -389,8 +484,6 @@
- name: Make Standard Bimanual Demo desktop icon Trusted
shell: gio set "{{ demo_icon_folder }}//Demo Bimanual Hands.desktop" "metadata::trusted" yes
when:
- ansible_distribution|string == 'Ubuntu'
- ansible_distribution_release|string == 'bionic'
- not skip_molecule_task|bool

when:
Expand Down