Compare commits

..

No commits in common. "4b4e72ccf42f8ab26e211b19c1397648719afbdf" and "095a060be5f6da1025cbc85e52440390b512021e" have entirely different histories.

5 changed files with 13 additions and 43 deletions

3
.github/release.md vendored
View file

@ -1,3 +1,2 @@
# Thanks for checking out ArmCord dev builds!
These builds are unstable and not ready for full release. They contain new experimental features and changes. We provide no official support for them.
# Thanks for checking out ArmCord dev build!
Make sure to join our [Discord server](https://discord.gg/uaW5vMY3V6) to share opinions, or to chat with ArmCord developers!

View file

@ -1,8 +1,5 @@
name: Dev build
on:
push:
branches:
- dev
on: [push]
env:
FORCE_COLOR: true
@ -26,18 +23,13 @@ jobs:
run: npm install -g electron-builder
- name: Build
run: npm run build && electron-builder --linux zip && electron-builder --arm64 --linux zip
run: npm run build && electron-builder --linux zip
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: ArmCordLinux.zip
path: dist/ArmCord-3.1.0.zip
- name: Upload artifact
uses: actions/upload-artifact@v2
with:
name: ArmCordLinuxArm64.zip
path: dist/ArmCord-3.1.0-arm64.zip
build-mac:
runs-on: macos-latest
@ -116,11 +108,6 @@ jobs:
with:
name: ArmCordLinux.zip
path: linux
- uses: actions/download-artifact@v2
with:
name: ArmCordLinuxArm64.zip
path: linux
- run: |
ls
ls windows
@ -131,25 +118,18 @@ jobs:
shell: bash
run: |
echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
- uses: dev-drprasad/delete-tag-and-release@v0.2.0
with:
delete_release: true
tag_name: devbuild
repo: ArmCord/ArmCord
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Create the release
uses: softprops/action-gh-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: devbuild
tag_name: ${{ steps.vars.outputs.sha_short }}
name: Dev Build ${{ steps.vars.outputs.sha_short }}
draft: false
prerelease: true
body_path: .github/release.md
files: |
linux/ArmCord-3.1.0.zip
linux/ArmCord-3.1.0-arm64.zip
macos/ArmCord-3.1.0-mac.zip
windows/ArmCord-3.1.0-win.zip

View file

@ -32,7 +32,7 @@
# How to run/install it?
### Recommended:
Check releases tab for precompiled packages for Linux, Windows and Mac OS. Alternatively use our Sourceforge mirror.
Check releases tab for precompiled packages for Linux, Windows and ~~Mac OS~~ (Mac OS is broken see [#48](https://github.com/ArmCord/ArmCord/issues/48)). Alternatively use our Sourceforge mirror.
<a href="https://sourceforge.net/projects/armcord/files/latest/download"><img alt="Download ArmCord" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a>
### AUR Package
Armcord is also available on the Arch User Repository (AUR) [here](https://aur.archlinux.org/packages/armcord-bin/).
@ -51,15 +51,14 @@ Install it via an AUR helper tool like `yay`.
# FAQ
## 1. Will I get banned from using it?
- You are breaking Discord ToS if you decided to use client mods. But no one ever got banned from using ArmCord or any of the client mods included. If you wish to remove mods, check our documentation.
-You are breaking Discord ToS if you decided to use client mods. But no one ever got banned from using ArmCord or any of the client mods included. If you wish to remove mods, check our documentation.
## 2. How does this work?
- We are using official web app and adding some magic powder to make it all work!
-We are using official web app and adding some magic powder to make it all work!
## 3. Can I use this on other architectures or operating systems?
- Yes! ArmCord should work normally under Windows, Mac OS and Linux as long as it has NodeJS, npm and Electron support.
## 4. Where can I translate this?
- Translations are done using our [Weblate page](https://hosted.weblate.org/projects/armcord/armcord/). They're pushed to this [repo](https://github.com/ArmCord/i18n).
-Yes! ArmCord should work normally under Windows, Mac OS and Linux as long as it has NodeJS, npm and Electron support.
# Credits
[ArmCord UI Elements and few features](https://github.com/kckarnige)
[Cumcord](https://github.com/Cumcord/Cumcord)

View file

@ -10,6 +10,3 @@
.notice-2HEN-u {
display: none;
}
.sidebar-1tnWFu {
border-top-left-radius: 8px !important;
}

View file

@ -83,7 +83,7 @@ export async function getConfig(object: string) {
const settingsFile = storagePath + "settings.json";
let rawdata = fs.readFileSync(settingsFile, "utf-8");
let returndata = JSON.parse(rawdata);
console.log(object + ": " + returndata[object]);
console.log(returndata[object]);
return returndata[object];
} catch (e) {
console.log("Config probably doesn't exist yet. Returning setup value.");
@ -124,12 +124,7 @@ export async function checkIfConfigExists() {
const userDataPath = app.getPath("userData");
const storagePath = path.join(userDataPath, "/storage/");
const settingsFile = storagePath + "settings.json";
if (!fs.existsSync(settingsFile)) {
if (!fs.existsSync(storagePath)) {
fs.mkdirSync(storagePath);
console.log("Created missing storage folder");
}
console.log("First run of the ArmCord. Starting setup.");
setup();
contentPath = path.join(__dirname, "/content/setup.html");