smartfridge/armcord
1
1
Fork 0
mirror of https://github.com/smartfrigde/armcord.git synced 2024-08-14 23:56:58 +00:00
Code Issues Projects Releases Wiki Activity

Skip updater if running development version

Browse source
This commit is contained in:
Alyxia Sother 2022-04-22 22:09:35 +02:00
parent 6876cc0ec1
commit 73347d557e
No known key found for this signature in database
GPG key ID: 355968D14144B739
2 changed files with 19 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/dev.yml vendored
View file

@ -28,8 +28,6 @@ jobs:
- name: Replace the version number - name: Replace the version number
run: cat src/utils.ts | sed -e 's/[[:digit:]]\.[[:digit:]]\.[[:digit:]]/DEV/g' | tee src/utils.ts > /dev/null run: cat src/utils.ts | sed -e 's/[[:digit:]]\.[[:digit:]]\.[[:digit:]]/DEV/g' | tee src/utils.ts > /dev/null
- run: cat src/utils.ts
- name: Build - name: Build
run: npm run build && electron-builder --linux zip && electron-builder --arm64 --linux zip run: npm run build && electron-builder --linux zip && electron-builder --arm64 --linux zip
@ -64,8 +62,6 @@ jobs:
- name: Replace the version number - name: Replace the version number
run: cat src/utils.ts | sed -e 's/[[:digit:]]\.[[:digit:]]\.[[:digit:]]/DEV/g' | tee src/utils.ts > /dev/null run: cat src/utils.ts | sed -e 's/[[:digit:]]\.[[:digit:]]\.[[:digit:]]/DEV/g' | tee src/utils.ts > /dev/null
- run: cat src/utils.ts
- name: Build - name: Build
run: npm run build && electron-builder --macos zip run: npm run build && electron-builder --macos zip
env: env:

7
src/content/splash.html
View file

@ -22,6 +22,9 @@
text.innerHTML = "You appear to be offline. Please connect to the internet and try again."; text.innerHTML = "You appear to be offline. Please connect to the internet and try again.";
} else { } else {
text.innerHTML = "Starting ArmCord..."; text.innerHTML = "Starting ArmCord...";
if (window.armcord.version === "DEV") {
console.log("Running a development build of ArmCord. Skipping updater.");
} else {
fetch("https://armcord.xyz/latest.json") fetch("https://armcord.xyz/latest.json")
.then((response) => response.json()) .then((response) => response.json())
.then((data) => { .then((data) => {
@ -31,11 +34,13 @@
elem.src = "https://armcord.smartfridge.space/update.webp"; elem.src = "https://armcord.smartfridge.space/update.webp";
document.body.prepend(elem); document.body.prepend(elem);
document.getElementById("splashscreen-armcord").remove(); document.getElementById("splashscreen-armcord").remove();
text.innerHTML = "A new version of ArmCord is available. Please update to the latest version."; text.innerHTML =
"A new version of ArmCord is available. Please update to the latest version.";
} else { } else {
console.log("ArmCord is up to date."); console.log("ArmCord is up to date.");
} }
}); });
}
setTimeout(() => { setTimeout(() => {
window.armcordinternal.splashEnd(); window.armcordinternal.splashEnd();
switch (window.armcord.channel) { switch (window.armcord.channel) {