From 1ee03b283c1ba78ca5b053af361a17beb23ec8e0 Mon Sep 17 00:00:00 2001 From: Peter Eszlari Date: Sun, 23 Sep 2018 19:55:57 +0200 Subject: [PATCH 1/2] switch from tar to deb --- code.desktop => com.visualstudio.code.desktop | 0 com.visualstudio.code.json | 40 +++++++++---------- 2 files changed, 18 insertions(+), 22 deletions(-) rename code.desktop => com.visualstudio.code.desktop (100%) diff --git a/code.desktop b/com.visualstudio.code.desktop similarity index 100% rename from code.desktop rename to com.visualstudio.code.desktop diff --git a/com.visualstudio.code.json b/com.visualstudio.code.json index fffc6b6..15efb74 100644 --- a/com.visualstudio.code.json +++ b/com.visualstudio.code.json @@ -83,35 +83,31 @@ "name": "vscode", "buildsystem": "simple", "build-commands": [ - "install -Dm755 apply_extra /app/bin/apply_extra", - "install -Dm755 code.sh /app/bin/code", + "cp /usr/bin/ar /app/bin", + "install -Dt /app/bin apply_extra code", "install -Dm644 com.visualstudio.code-64.png /app/share/icons/hicolor/64x64/apps/com.visualstudio.code.png", "install -Dm644 com.visualstudio.code-128.png /app/share/icons/hicolor/128x128/apps/com.visualstudio.code.png", "install -Dm644 com.visualstudio.code-256.png /app/share/icons/hicolor/256x256/apps/com.visualstudio.code.png", "install -Dm644 com.visualstudio.code-512.png /app/share/icons/hicolor/512x512/apps/com.visualstudio.code.png", - "install -Dm644 com.visualstudio.code.appdata.xml /app/share/appdata/com.visualstudio.code.appdata.xml", - "install -Dm644 code.desktop /app/share/applications/com.visualstudio.code.desktop", + "install -Dm644 -t /app/share/metainfo com.visualstudio.code.appdata.xml", + "install -Dm644 -t /app/share/applications com.visualstudio.code.desktop", "install -Dm644 npmrc /app/etc/npmrc" ], - "cleanup": [ - "/share/lintian", - "/share/pixmaps" - ], "sources": [ { "type": "script", "dest-filename": "apply_extra", "commands": [ - "tar -xf code.tar.gz", - "rm -f code.tar.gz", - "mv VSCode-linux-* vscode", - "install -Dm644 /app/share/applications/com.visualstudio.code.desktop export/share/applications/com.visualstudio.code.desktop" + "ar x code.deb", + "tar -xf data.tar.xz", + "mv usr/share/code vscode", + "rm -rf code.deb control.tar.gz data.tar.gz debian-binary usr" ] }, { "type": "script", "commands": ["exec env PATH=\"$PATH:$XDG_DATA_HOME/node_modules/bin\" /app/extra/vscode/bin/code --extensions-dir=$XDG_DATA_HOME/vscode/extensions \"$@\""], - "dest-filename": "code.sh" + "dest-filename": "code" }, { "type": "file", @@ -123,7 +119,7 @@ }, { "type": "file", - "path": "code.desktop" + "path": "com.visualstudio.code.desktop" }, { "type": "file", @@ -143,19 +139,19 @@ }, { "type": "extra-data", - "filename": "code.tar.gz", + "filename": "code.deb", "only-arches": ["x86_64"], - "url": "https://vscode-update.azurewebsites.net/1.27.2/linux-x64/stable", - "sha256": "11023c652dd89bde1b7fbc8a7dc04fd4f87df3bfe6952a1c0ad75ab861e3196d", - "size": 66446563 + "url": "https://vscode-update.azurewebsites.net/1.27.2/linux-deb-x64/stable", + "sha256": "35aedf314a3d886e1affac8591904ba0b1ffb7e20075acabf7bfeec1fa2b6515", + "size": 45365022 }, { "type": "extra-data", - "filename": "code.tar.gz", + "filename": "code.deb", "only-arches": ["i386"], - "url": "https://vscode-update.azurewebsites.net/1.27.2/linux-ia32/stable", - "sha256": "33704d089b03c636e8c46d434068c97b66e5a9d323b991bd327067aa90e87afa", - "size": 69492248 + "url": "https://vscode-update.azurewebsites.net/1.27.2/linux-deb-ia32/stable", + "sha256": "57aed7e9e9de896f9a7530c49953ad916657cbcf41d8309c35978055cf4e9159", + "size": 47703998 } ] From 6c3a81b9824641481a289039683be53454c86412 Mon Sep 17 00:00:00 2001 From: Nick Richards Date: Mon, 8 Oct 2018 21:25:33 +0100 Subject: [PATCH 2/2] Update to 1.28.0, FDo 18.08 and Electron BaseApp2 --- com.visualstudio.code.appdata.xml | 1 + com.visualstudio.code.json | 28 ++++++++-------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/com.visualstudio.code.appdata.xml b/com.visualstudio.code.appdata.xml index 938e32e..ee2c6df 100644 --- a/com.visualstudio.code.appdata.xml +++ b/com.visualstudio.code.appdata.xml @@ -23,6 +23,7 @@ TextEditor + diff --git a/com.visualstudio.code.json b/com.visualstudio.code.json index 15efb74..72536e1 100644 --- a/com.visualstudio.code.json +++ b/com.visualstudio.code.json @@ -2,9 +2,9 @@ "app-id": "com.visualstudio.code", "branch": "stable", "base": "io.atom.electron.BaseApp", - "base-version": "stable", + "base-version": "18.08", "runtime": "org.freedesktop.Sdk", - "runtime-version": "1.6", + "runtime-version": "18.08", "sdk": "org.freedesktop.Sdk", "command": "code", "tags": ["proprietary"], @@ -48,18 +48,6 @@ } ] }, - { - "name": "xkbfile", - "cleanup": ["/include", "/lib/*.la", "/lib/pkgconfig"], - "config-opts": ["--disable-static"], - "sources": [ - { - "type": "archive", - "url": "https://www.x.org/releases/individual/lib/libxkbfile-1.0.9.tar.bz2", - "sha256": "51817e0530961975d9513b773960b4edd275f7d5c72293d5a151ed4f42aeb16a" - } - ] - }, { "name": "nodejs", "cleanup": [ @@ -141,17 +129,17 @@ "type": "extra-data", "filename": "code.deb", "only-arches": ["x86_64"], - "url": "https://vscode-update.azurewebsites.net/1.27.2/linux-deb-x64/stable", - "sha256": "35aedf314a3d886e1affac8591904ba0b1ffb7e20075acabf7bfeec1fa2b6515", - "size": 45365022 + "url": "https://vscode-update.azurewebsites.net/1.28.0/linux-deb-x64/stable", + "sha256": "6fd906da3db45b8a922dc7cb4ce2cbd222cc73f313103feae931e8633c934f9e", + "size": 44133200 }, { "type": "extra-data", "filename": "code.deb", "only-arches": ["i386"], - "url": "https://vscode-update.azurewebsites.net/1.27.2/linux-deb-ia32/stable", - "sha256": "57aed7e9e9de896f9a7530c49953ad916657cbcf41d8309c35978055cf4e9159", - "size": 47703998 + "url": "https://vscode-update.azurewebsites.net/1.28.0/linux-deb-ia32/stable", + "sha256": "ce3d6b3066b78bb79e65c234a1e516237d0ab0675a92b82515f48c5edfb63d84", + "size": 46478748 } ]