summaryrefslogtreecommitdiffstats
path: root/application/package
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-09-28 23:28:40 +0200
committerPetr Mrázek <peterix@gmail.com>2015-09-28 23:28:40 +0200
commit12b14c3400e11bb712efe760ed7a2cf46d2f75c7 (patch)
tree83637765119d207503d559f2eee7b06e92483f31 /application/package
parent00994a425e0ea83b15e160e62486329d2c8c41d9 (diff)
downloadMultiMC-12b14c3400e11bb712efe760ed7a2cf46d2f75c7.tar
MultiMC-12b14c3400e11bb712efe760ed7a2cf46d2f75c7.tar.gz
MultiMC-12b14c3400e11bb712efe760ed7a2cf46d2f75c7.tar.lz
MultiMC-12b14c3400e11bb712efe760ed7a2cf46d2f75c7.tar.xz
MultiMC-12b14c3400e11bb712efe760ed7a2cf46d2f75c7.zip
GH-1179 incorporate fixes for comments from linked changeset
Use SSL for downloads Use XDG dirs for storage Do not run from deploy function
Diffstat (limited to 'application/package')
-rwxr-xr-xapplication/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh b/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh
index 7a215abd..9b934302 100755
--- a/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh
+++ b/application/package/ubuntu/multimc_1.1-1/opt/multimc/run.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-INSTDIR=~/.multimc
+INSTDIR=$XDG_DATA_HOME/multimc
if [ `getconf LONG_BIT` = "64" ]
then
PACKAGE="mmc-stable-lin64.tar.gz"
@@ -12,12 +12,11 @@ deploy() {
mkdir -p $INSTDIR
cd ${INSTDIR}
- wget --progress=dot:force "http://files.multimc.org/downloads/${PACKAGE}" 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-close --auto-kill --title="Downloading MultiMC..."
+ wget --progress=dot:force "https://files.multimc.org/downloads/${PACKAGE}" 2>&1 | sed -u 's/.* \([0-9]\+%\)\ \+\([0-9.]\+.\) \(.*\)/\1\n# Downloading at \2\/s, ETA \3/' | zenity --progress --auto-close --auto-kill --title="Downloading MultiMC..."
tar -xzf ${PACKAGE} --transform='s,MultiMC/,,'
rm ${PACKAGE}
chmod +x MultiMC
- ./MultiMC
}
runmmc() {
@@ -27,6 +26,7 @@ runmmc() {
if [[ ! -f ${INSTDIR}/MultiMC ]]; then
deploy
+ runmmc
else
runmmc
fi