Merge branch 'dev'

Author: ChugunovRoman

.github/workflows/manualrun_launchpad.yml

@@ -1,15 +1,23 @@
 name: Manually Upload to Launchpad PPA
 
-on: workflow_dispatch
+on:
+  workflow_dispatch:
+    inputs:
+      rev:
+        description: 'FIGMA_LINUX_REV'
+        required: true
+        default: '2'
 
 jobs:
   setup:
     name: Setup
     uses: ./.github/workflows/reuse_setup.yml
     secrets: inherit
 
-  flathub:
+  launchpad:
     name: Upload
     uses: ./.github/workflows/reuse_launchpad.yml
-    secrets: inherit
     needs: setup
+    secrets: inherit
+    with:
+      rev: "${{ github.event.inputs.rev }}"

.github/workflows/release.yml

@@ -66,5 +66,6 @@ jobs:
   launchpad:
     name: Upload
     uses: ./.github/workflows/reuse_launchpad.yml
-    secrets: inherit
+    rev:
+      FIGMA_LINUX_REV: 1
     needs: [release_amd64, release_arm64v8]

.github/workflows/reuse_launchpad.yml

@@ -1,6 +1,11 @@
 name: Launchpad PPA
 
-on: workflow_call
+on:
+  workflow_call:
+    inputs:
+      rev:
+        required: true
+        type: string
 
 jobs:
   launchpad:
@@ -11,7 +16,7 @@ jobs:
         with:
           path: ./
 
-      - name: Get Artefacts
+      - name: Prepare
         run: |
           cd ./repo
           newVersion=$(git tag --sort=version:refname | tail -n1 | tr -d 'v' | tr -d '\n')
@@ -41,4 +46,4 @@ jobs:
 
       - name: Build and Upload PPA
         run: |
-          ./scripts/build_ppa.sh "1"
+          ./scripts/build_ppa.sh "${{ github.event.inputs.rev }}"

docker/Build_ppa

@@ -10,7 +10,7 @@ ENV USER=root
 COPY ./build ./build
 COPY ./gpg ./
 
-RUN cat ./build/figma-linux-${FIGMA_LINUX_VERSION}/debian/changelog && \
+RUN apt update &&  apt install xdg-utils -y && cat ./build/figma-linux-${FIGMA_LINUX_VERSION}/debian/changelog && \
   chmod a+x ./build/figma-linux-${FIGMA_LINUX_VERSION}/figma-linux && \
   chmod a+x ./build/figma-linux-${FIGMA_LINUX_VERSION}/chrome-sandbox && \
   chmod a+x ./build/figma-linux-${FIGMA_LINUX_VERSION}/*.sh && \

scripts/build_ppa.sh

@@ -20,6 +20,17 @@ mkdir -p $workdir/resources/icon;
 
 echo "PWD: $(pwd)";
 
+rm -rf /tmp/tmp_changelog
+touch /tmp/tmp_changelog
+echo "figma-linux (${version}-${rev}ubuntu0) devel; urgency=medium" >> /tmp/tmp_changelog
+echo "" >> /tmp/tmp_changelog
+echo "  * Publish ${version} version" >> /tmp/tmp_changelog
+echo "${notes}" >> /tmp/tmp_changelog
+echo " -- Chugunov Roman <Zebs-BMK@yandex.ru>  $(date -R)" >> /tmp/tmp_changelog
+echo "" >> /tmp/tmp_changelog
+echo "$(cat /tmp/tmp_changelog ./scripts/debian/changelog)" > ./scripts/debian/changelog
+rm -rf /tmp/tmp_changelog
+
 cp -rf ./scripts/debian $workdir;
 cp -rf ${linux_unpacked}/* $workdir;
 cp -rf ${linux_unpacked}/icons/* $workdir/resources/icon;

scripts/debian/control

@@ -2,13 +2,13 @@ Source: figma-linux
 Section: graphics
 Priority: optional
 Maintainer: Chugunov Roman <Zebs-BMK@yandex.ru>
-Build-Depends: debhelper (>= 10), rsync
+Build-Depends: debhelper (>= 10), rsync, xdg-utils
 Standards-Version: 4.1.2
 Homepage: https://github.com/Figma-linux/figma-linux
 #Vcs-Git: https://anonscm.debian.org/git/collab-maint/figma-linux.git
 #Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/figma-linux.git
 
 Package: figma-linux
-Depends: libnss3 (>= 3.26)
+Depends: libnss3 (>= 3.26), xdg-utils
 Architecture: amd64
 Description: Figma is the first interface design tool based in the browser, making it easier for teams to create software.

scripts/debian/rules

@@ -12,6 +12,7 @@ override_dh_auto_install:
 	mkdir -p ./debian/figma-linux/usr/share/icons/hicolor
 	rsync -av --progress ./* ./debian/figma-linux/opt/figma-linux/ --exclude debian --exclude .pc --exclude resources/icon --exclude resources/figma-linux.desktop
 	cp -rf ./resources/figma-linux.desktop ./debian/figma-linux/usr/share/applications/
+	chmod 755 ./debian/figma-linux/opt/figma-linux/figma-linux
 
 	bash -c 'for file in ./resources/icon/*; do name=`basename $${file%.*}`; mkdir -p ./debian/figma-linux/usr/share/icons/hicolor/$${name}/apps; cp -rf "$$file" ./debian/figma-linux/usr/share/icons/hicolor/$${name}/apps/figma-linux.png; done'