From 2e6eeeb0aea839e43d8e00285f319d94c6581b94 Mon Sep 17 00:00:00 2001 From: Alfred Neumayer Date: Mon, 7 Mar 2022 09:57:48 +0100 Subject: [PATCH] treewide: Switch to VSCodium --- build.sh | 20 +++++++------------- clickable.json | 2 +- code.desktop | 9 --------- code.apparmor => codium.apparmor | 0 codium.desktop | 9 +++++++++ manifest.json | 12 ++++++------ 6 files changed, 23 insertions(+), 29 deletions(-) delete mode 100644 code.desktop rename code.apparmor => codium.apparmor (100%) create mode 100644 codium.desktop diff --git a/build.sh b/build.sh index 4ca5e49..d2b476e 100644 --- a/build.sh +++ b/build.sh @@ -2,23 +2,17 @@ sed -e -rm PKGBUILD* || true rm *.tar.gz -wget https://raw.githubusercontent.com/KaOS-Community-Packages/vscode/master/PKGBUILD -sed -i "s/^arch=('x86_64')//g" PKGBUILD -sed -i "s/ln -s/#ln -s/g" PKGBUILD -sed -i "s/VSCode-linux-x64/VSCode-linux-$1/g" PKGBUILD -source PKGBUILD - +pkgname=vscodium +pkgver=1.65.0 srcdir=$ROOT/build/aarch64-linux-gnu/app pkgdir=$srcdir/install mkdir -p $srcdir $pkgdir -wget https://az764295.vo.msecnd.net/stable/b5205cc8eb4fbaa726835538cd82372cc0222d43/code-stable-$1-1646219865.tar.gz -tar xvf ./code-stable-$1-1646219865.tar.gz -C $srcdir - -package +wget https://github.com/VSCodium/vscodium/releases/download/$pkgver/VSCodium-linux-$1-$pkgver.tar.gz +mkdir -p $srcdir/vscodium/VSCodium-linux-$1-$pkgver +tar xvf ./VSCodium-linux-$1-$pkgver.tar.gz -C $pkgdir CLICK_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) CLICK_FRAMEWORK=ubuntu-sdk-16.04.5 @@ -26,7 +20,7 @@ CLICK_FRAMEWORK=ubuntu-sdk-16.04.5 cp $ROOT/manifest.json $pkgdir/ sed -i "s/@CLICK_ARCH@/$CLICK_ARCH/g" $pkgdir/manifest.json sed -i "s/@CLICK_FRAMEWORK@/$CLICK_FRAMEWORK/g" $pkgdir/manifest.json -cp $ROOT/code.apparmor $pkgdir/ -cp $ROOT/code.desktop $pkgdir/ +cp $ROOT/codium.apparmor $pkgdir/ +cp $ROOT/codium.desktop $pkgdir/ exit 0 diff --git a/clickable.json b/clickable.json index a2f0071..a355c60 100644 --- a/clickable.json +++ b/clickable.json @@ -3,7 +3,7 @@ "builder": "custom", "default": "clean build click-build", "kill": "code*", - "build": "bash ${ROOT}/build.sh arm64", + "build": "bash ${ROOT}/build.sh ${ARCH}", "dependencies_host": [ "libgles2", "wget" diff --git a/code.desktop b/code.desktop deleted file mode 100644 index 3e56c5c..0000000 --- a/code.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=Visual Studio Code -Exec=env GDK_BACKEND=x11 GDK_SCALE=2 ./opt/vscode/code --force-device-scale-factor=2 %U -Icon=./opt/vscode/resources/app/resources/linux/code.png -Terminal=false -Type=Application -X-Ubuntu-Touch=true -X-Ubuntu-Splash-Color=#FFFFFF -X-Ubuntu-XMir-Enable=true diff --git a/code.apparmor b/codium.apparmor similarity index 100% rename from code.apparmor rename to codium.apparmor diff --git a/codium.desktop b/codium.desktop new file mode 100644 index 0000000..edf071d --- /dev/null +++ b/codium.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Name=VSCodium +Exec=env GDK_BACKEND=x11 GDK_SCALE=2 ./codium --force-device-scale-factor=2 %U +Icon=./resources/app/resources/linux/code.png +Terminal=false +Type=Application +X-Ubuntu-Touch=true +X-Ubuntu-Splash-Color=#FFFFFF +X-Ubuntu-XMir-Enable=true diff --git a/manifest.json b/manifest.json index 35f96aa..d337c32 100644 --- a/manifest.json +++ b/manifest.json @@ -1,15 +1,15 @@ { - "name": "code.visualstudio.com", - "description": "Code Editor by Microsoft", + "name": "codium.vscodium.com", + "description": "Open Source Code Editor", "architecture": "@CLICK_ARCH@", - "title": "Visual Studio Code", + "title": "VSCodium", "hooks": { "code": { - "apparmor": "code.apparmor", - "desktop": "code.desktop" + "apparmor": "codium.apparmor", + "desktop": "codium.desktop" } }, - "version": "1.64.2", + "version": "1.65.0", "maintainer": "Alfred Neumayer ", "framework" : "@CLICK_FRAMEWORK@" }