From 044715405c8536eeca865898492c23ca375893b5 Mon Sep 17 00:00:00 2001
From: Peter Eszlari <peter.eszlari@gmail.com>
Date: Tue, 2 Apr 2019 00:37:34 +0200
Subject: [PATCH] Add warning at startup

---
 code.sh                    | 15 +++++++++++++++
 com.visualstudio.code.json | 35 +++++++++++++++++++++--------------
 flatpak-warning.txt        | 31 +++++++++++++++++++++++++++++++
 3 files changed, 67 insertions(+), 14 deletions(-)
 create mode 100755 code.sh
 create mode 100644 flatpak-warning.txt

diff --git a/code.sh b/code.sh
new file mode 100755
index 0000000..628e4a8
--- /dev/null
+++ b/code.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+set -e
+
+FIRST_RUN="${XDG_CONFIG_HOME}/flatpak-vscode-first-run"
+
+[ ! -f ${FIRST_RUN} ] && export WARNING_FILE="/app/share/vscode/flatpak-warning.txt"
+touch ${FIRST_RUN}
+
+for D in /usr/lib/sdk/*; do
+  [ -f "${D}/enable.sh" ] && . "${D}/enable.sh"
+done
+
+exec env PATH="${PATH}:${XDG_DATA_HOME}/node_modules/bin" \
+  /app/extra/vscode/bin/code --extensions-dir=${XDG_DATA_HOME}/vscode/extensions "$@" ${WARNING_FILE}
diff --git a/com.visualstudio.code.json b/com.visualstudio.code.json
index 5b335e7..e789f6f 100644
--- a/com.visualstudio.code.json
+++ b/com.visualstudio.code.json
@@ -7,12 +7,14 @@
   "runtime-version": "18.08",
   "sdk": "org.freedesktop.Sdk",
   "command": "code",
-  "tags": ["proprietary"],  
+  "tags": ["proprietary"],
+  "desktop-file-name-suffix": " (Flatpak)",
   "separate-locales": false,
   "finish-args": [
-      "--share=ipc", "--socket=x11",
-      "--socket=pulseaudio",
       "--require-version=0.10.3",
+      "--share=ipc",
+      "--socket=x11",
+      "--socket=pulseaudio",
       "--socket=ssh-auth",
       "--share=network",
       "--device=dri",
@@ -58,16 +60,18 @@
         "name": "vscode",
         "buildsystem": "simple",
         "build-commands": [
-            "cp /usr/bin/ar /app/bin",
-            "ARCH_TRIPLE=$(gcc --print-multiarch) && cp /usr/lib/${ARCH_TRIPLE}/libbfd-*.so /app/lib",
-            "install -Dt /app/bin apply_extra code",
+            "install -D code.sh /app/bin/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 -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"
+            "install -Dm644 com.visualstudio.code.appdata.xml -t /app/share/metainfo",            
+            "install -Dm644 com.visualstudio.code.desktop -t /app/share/applications",
+            "install -Dm644 npmrc -t /app/etc",
+            "install -Dm644 flatpak-warning.txt -t /app/share/vscode",
+            "install -D apply_extra -t /app/bin",
+            "cp /usr/bin/ar /app/bin",
+            "ARCH_TRIPLE=$(gcc --print-multiarch) && cp /usr/lib/${ARCH_TRIPLE}/libbfd-*.so /app/lib"
         ],
         "sources": [
             {
@@ -75,15 +79,18 @@
                 "dest-filename": "apply_extra",
                 "commands": [
                     "ar x code.deb",
-                    "tar -xf data.tar.xz",
+                    "tar xf data.tar.xz",
                     "mv usr/share/code vscode",
-                    "rm -rf code.deb control.tar.gz data.tar.gz debian-binary usr"
+                    "rm -r code.deb control.tar.gz data.tar.xz 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"
+                "type": "file",
+                "path": "code.sh"
+            },
+            {
+                "type": "file",
+                "path": "flatpak-warning.txt"
             },
             {
                 "type": "file",
diff --git a/flatpak-warning.txt b/flatpak-warning.txt
new file mode 100644
index 0000000..8a53310
--- /dev/null
+++ b/flatpak-warning.txt
@@ -0,0 +1,31 @@
+
+https://www.flathub.org
+
+------------------------------------------------------------------------------------
+| Warning: You are running an unofficial Flatpak version of Visual Studio Code !!! |
+------------------------------------------------------------------------------------
+
+Please open issues under: https://github.com/flathub/com.visualstudio.code/issues
+
+
+This version is running inside a container and is therefore not able
+to access SDKs on your host system!
+
+It comes with a standard development environment (gcc, python, etc).
+To see what's available:
+
+  $ flatpak run --command=sh com.visualstudio.code
+  $ ls /usr/bin (shared runtime)
+  $ ls /app/bin (bundled with this flatpak)
+
+To get support for additional languages, you have to install SDK extensions, e.g.
+
+  $ flatpak install flathub org.freedesktop.Sdk.Extension.dotnet
+
+to install the .NET Core SDK.
+
+You can use
+
+  $ flatpak search <TEXT>
+
+to find others.