diff --git a/CHANGELOG.md b/CHANGELOG.md index 6354e36..3ab1784 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog +**0.1.5** +* Drop The ``-R`` + **0.1.4** * Update To Reflect MCPI-Reborn Name Change diff --git a/README.md b/README.md index 9d79ea4..587b02a 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# MCPIL-R -This is a rewrite of th original [MCPIL](https://github.com/MCPI-Devs/MCPIL) project meant to be less fragile and more compatible. +# MCPIL +This is a rewrite of the original [MCPIL](https://github.com/MCPI-Devs/MCPIL-Old) project meant to be less fragile and more compatible. ## Getting started ### Prerequisites - Python >= 3.7.x -- [MCPI-Docker](https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-docker) +- [MCPI-Reborn](https://gitea.thebrokenrail.com/TheBrokenRail/minecraft-pi-reborn) ### System Requirements Raspbian Buster/Ubuntu 18.04 Or Higher @@ -18,18 +18,18 @@ Download and install MCPIL from the Packagecloud Debian repository: curl -s https://packagecloud.io/install/repositories/Alvarito050506/mcpi-devs/script.deb.sh | sudo bash # Now the actual installation -sudo apt-get install mcpil-r +sudo apt-get install mcpil ``` ## Changelog [View Changelog](CHANGELOG.md) ## Debian Packages -[GitHub Releases](https://github.com/MCPI-Devs/MCPIL-R/releases/latest) +[GitHub Releases](https://github.com/MCPI-Devs/MCPIL/releases/latest) ## Packaging ```sh -git clone --recurse-submodules https://github.com/MCPI-Devs/MCPIL-R.git -cd MCPIL-R +git clone --recurse-submodules https://github.com/MCPI-Devs/MCPIL.git +cd MCPIL ./scripts/package.sh ``` diff --git a/debian/common/DEBIAN/control b/debian/common/DEBIAN/control index f45a0df..010f511 100644 --- a/debian/common/DEBIAN/control +++ b/debian/common/DEBIAN/control @@ -1,7 +1,7 @@ -Package: mcpil-r +Package: mcpil Version: ${VERSION} Maintainer: TheBrokenRail -Description: MCPI Launcher - Rebooted +Description: Minecraft Pi Launcher Homepage: https://mcpi.tk Architecture: all Depends: python3, python3-tk, minecraft-pi-reborn-virgl | minecraft-pi-reborn-native diff --git a/debian/common/usr/bin/mcpil b/debian/common/usr/bin/mcpil new file mode 100755 index 0000000..fa9621a --- /dev/null +++ b/debian/common/usr/bin/mcpil @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +exec python3 /opt/mcpil/mcpil.py \ No newline at end of file diff --git a/debian/common/usr/bin/mcpil-r b/debian/common/usr/bin/mcpil-r deleted file mode 100755 index 80d0b80..0000000 --- a/debian/common/usr/bin/mcpil-r +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -set -e - -exec python3 /opt/mcpil-r/mcpil-r.py \ No newline at end of file diff --git a/debian/common/usr/share/applications/mcpil-r.desktop b/debian/common/usr/share/applications/mcpil-r.desktop deleted file mode 100755 index 9945c4d..0000000 --- a/debian/common/usr/share/applications/mcpil-r.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Name=MCPIL-R -Comment=MCPI Launcher - Rebooted -Icon=/usr/share/pixmaps/mcpil-r.png -StartupNotify=false -StartupWMClass=mcpil-r -Exec=/usr/bin/mcpil-r -Terminal=false -Type=Application -Categories=Application;Game; diff --git a/debian/common/usr/share/applications/mcpil.desktop b/debian/common/usr/share/applications/mcpil.desktop new file mode 100755 index 0000000..33e33e1 --- /dev/null +++ b/debian/common/usr/share/applications/mcpil.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=MCPIL +Comment=Minecraft Pi Launcher +Icon=/usr/share/pixmaps/mcpil.png +StartupNotify=false +StartupWMClass=mcpil +Exec=/usr/bin/mcpil +Terminal=false +Type=Application +Categories=Application;Game; diff --git a/debian/common/usr/share/pixmaps/mcpil-r.png b/debian/common/usr/share/pixmaps/mcpil.png similarity index 100% rename from debian/common/usr/share/pixmaps/mcpil-r.png rename to debian/common/usr/share/pixmaps/mcpil.png diff --git a/scripts/package.sh b/scripts/package.sh index 3f91101..666c379 100755 --- a/scripts/package.sh +++ b/scripts/package.sh @@ -12,9 +12,9 @@ rm -rf out mkdir -p out # Copy -mkdir -p debian/tmp/opt/mcpil-r +mkdir -p debian/tmp/opt/mcpil rsync -r debian/common/ debian/tmp -rsync -r src/ debian/tmp/opt/mcpil-r +rsync -r src/ debian/tmp/opt/mcpil # Substitute sed -i 's/${VERSION}/'"$(cat src/VERSION)"'/g' debian/tmp/DEBIAN/control diff --git a/src/config.py b/src/config.py index 778cf83..ec322b9 100644 --- a/src/config.py +++ b/src/config.py @@ -5,7 +5,7 @@ import launcher def _get_config_path() -> str: - return str(Path.home()) + '/.mcpil-r.json' + return str(Path.home()) + '/.mcpil.json' def _copy(src: dict, dst: dict): for key in dst: diff --git a/src/mcpil-r.py b/src/mcpil.py similarity index 97% rename from src/mcpil-r.py rename to src/mcpil.py index 42d73e8..11c26e2 100755 --- a/src/mcpil-r.py +++ b/src/mcpil.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # -# mcpil-r.py +# mcpil.py # # Copyright 2020 Alvarito050506 # Copyright 2020 StealthHydrac/StealthHydra179/a1ma @@ -390,7 +390,7 @@ def multiplayer_tab(parent): # Get Version def get_version() -> str: try: - with open('/opt/mcpil-r/VERSION', 'r') as file: + with open('/opt/mcpil/VERSION', 'r') as file: return 'v' + file.readline().strip() except OSError: # File Does Not Exists Or Is Inaccessible @@ -412,12 +412,12 @@ def about_tab(parent): version.config(font=('', 10)) version.grid(row=1, sticky='NSEW') - authors = HyperLink(main_frame, 'https://github.com/MCPI-Devs/MCPIL/graphs/contributors', text='by all its contributors', + authors = HyperLink(main_frame, 'https://github.com/MCPI-Revival/MCPIL/graphs/contributors', text='by all its contributors', fg='black') authors.config(font=('', 10)) authors.grid(row=2, sticky='NSEW') - url = HyperLink(main_frame, 'https://github.com/MCPI-Devs/MCPIL-R') + url = HyperLink(main_frame, 'https://github.com/MCPI-Revival/MCPIL') url.config(font=('', 10)) url.grid(row=3, sticky='NSEW') @@ -432,8 +432,8 @@ def main(): global window - window = Tk(className='mcpil-r') - window.title('MCPI Launcher - Rebooted') + window = Tk(className='mcpil') + window.title('MCPIL') window.geometry('512x400') window.resizable(True, True)