Compare commits

..

No commits in common. "78c554be2d85b67c3b0a7484398ebce1f47e4eb8" and "72a0d9b7800010a30a01cffb972086bc0fdd559e" have entirely different histories.

4 changed files with 4 additions and 33 deletions

20
app.js
View File

@ -40,10 +40,7 @@ const run = () => {
const splitArray = [components.shift(), components.join(' - ')]; const splitArray = [components.shift(), components.join(' - ')];
rpcOsuVersion = splitArray[0]; rpcOsuVersion = splitArray[0];
currentMap = splitArray[1]; currentMap = splitArray[1];
if(currentMap.endsWith(".osu")){ rpc.updateState("Playing...");
rpc.updateState("Editing...");
currentMap = currentMap.substring(0, currentMap.length - 4);
} else rpc.updateState("Playing...");
} }
rpc.updateStatus(currentMap, rpcOsuVersion); rpc.updateStatus(currentMap, rpcOsuVersion);
@ -82,11 +79,7 @@ const run = () => {
const splitArray = [components.shift(), components.join(' - ')]; const splitArray = [components.shift(), components.join(' - ')];
rpcOsuVersion = splitArray[0]; rpcOsuVersion = splitArray[0];
currentMap = splitArray[1]; currentMap = splitArray[1];
if(currentMap.endsWith(".osu")){ rpc.updateState("Playing...");
rpc.updateState("Editing...");
currentMap = currentMap.substring(0, currentMap.length - 4);
}
else rpc.updateState("Playing...");
} }
rpc.updateStatus(currentMap, rpcOsuVersion); rpc.updateStatus(currentMap, rpcOsuVersion);
@ -119,15 +112,6 @@ const run = () => {
await tryLogin(mainWindow); await tryLogin(mainWindow);
await doUpdateCheck(mainWindow); await doUpdateCheck(mainWindow);
if (platform === "linux") { if (platform === "linux") {
try{
await terminalUtil.execCommand(`osu-stable -h`);
}catch(err){
mainWindow.webContents.send('status_update', {
type: "package-issue",
message: "Seems like you dont have the osu AUR Package installed, please install it."
});
return;
}
/* mainWindow.webContents.send('status_update', { /* mainWindow.webContents.send('status_update', {
type: "info", type: "info",
message: "We detected that you are running the Launcher under Linux. It's currently just compatible with Arch and the osu AUR package!" message: "We detected that you are running the Launcher under Linux. It's currently just compatible with Arch and the osu AUR package!"

View File

@ -85,11 +85,6 @@
gap: 20px; gap: 20px;
} }
.server-logo img {
user-select: none;
pointer-events: none;
}
.user-info { .user-info {
text-align: start; text-align: start;
display: flex; display: flex;

View File

@ -32,6 +32,8 @@
}, },
"scripts": { "scripts": {
"start": "electron .", "start": "electron .",
"test": "electron ./test/encrypt.js",
"rebuild": "electron-rebuild -f -w wincrypt",
"pack-win": "electron-builder --x64", "pack-win": "electron-builder --x64",
"pack-win32": "electron-builder --ia32", "pack-win32": "electron-builder --ia32",
"pack-winarm": "electron-builder --arm64", "pack-winarm": "electron-builder --arm64",

View File

@ -178,16 +178,6 @@ window.addEventListener('DOMContentLoaded', () => {
confirmButtonText: 'Okay' confirmButtonText: 'Okay'
}); });
break; break;
case "package-issue":
Swal.fire({
title: 'Uh oh!',
text: status.message,
icon: 'error',
confirmButtonText: 'Okay'
});
$("#launch-btn").attr('disabled', true);
$('#launch-btn').html('missing packages');
break;
case "update-complete": case "update-complete":
Swal.fire({ Swal.fire({
title: 'Yaaay!', title: 'Yaaay!',