From 8414d2a4c5c57a2ac2055cd44019eb1542e724fa Mon Sep 17 00:00:00 2001
From: Romain Bertozzi <romain.bertozzi@savoirfairelinux.com>
Date: Fri, 25 Mar 2016 11:53:23 -0400
Subject: [PATCH] Ubuntu Install: fix install script & update README
This patch implements a fix for the installation on the Ubuntu OS.
It removes the quotes from the NAME of the os-release file. These quotes
are not present in all distros, such as Fedora where they are absent.
A typo is fixed, that concatenated the cpu count with the -c argument.
Also, this patch fixes a typo in the README file concerning the py script
to call to run the dependencies installations.
Change-Id: I71c76a29ed1daee2b8ee133a20918d42a0156432
Tuleap: #451
---
README.md | 2 +-
make-ring.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 7c33bf8f..9cbc62f0 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ Ring installer uses python3. Please make sure it is installed before running it.
Build and install all the dependencies:
- ./ring-build --dependencies
+ ./make-ring.py --dependencies
#### Linux
Your distro package manager will be used.
diff --git a/make-ring.py b/make-ring.py
index 0e07ff76..4946b4a0 100755
--- a/make-ring.py
+++ b/make-ring.py
@@ -141,7 +141,7 @@ def run_install(args):
install_args += " -c client-macosx"
execute_script(["CONFIGURE_FLAGS='--without-dbus' ./scripts/install.sh " + install_args])
else:
- install_args += '-c client-gnome'
+ install_args += ' -c client-gnome'
execute_script(["./scripts/install.sh " + install_args])
@@ -286,7 +286,7 @@ def choose_distribution():
for line in f:
k,v = line.split("=")
if k.strip() == 'NAME':
- return v.strip()
+ return v.strip().replace('"','')
elif system == "darwin":
return 'OSX'
--
GitLab