summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-02 14:15:17 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-05-02 14:15:17 +0200
commitfa5c9eb0e1e1962373e602e6be5ccd544368382f (patch)
tree9e3d3814c878ba92a09159f64ec1fa47e8b49e7f
parent0f3ee58e13502b609fb476cec252fac2a5858883 (diff)
downloadIshtar-fa5c9eb0e1e1962373e602e6be5ccd544368382f.tar.bz2
Ishtar-fa5c9eb0e1e1962373e602e6be5ccd544368382f.zip
Install script: minor
-rw-r--r--install/README6
-rwxr-xr-xinstall/ishtar-delete-instance2
-rwxr-xr-xinstall/ishtar-install2
-rwxr-xr-xinstall/ishtar-prepare-instance8
4 files changed, 10 insertions, 8 deletions
diff --git a/install/README b/install/README
index d21f7fc2b..8dc6306f5 100644
--- a/install/README
+++ b/install/README
@@ -8,9 +8,9 @@ cd install
#### install
-bash ishtar-install
-bash ishtar-prepare-instance
+bash ./ishtar-install
+bash ./ishtar-prepare-instance
#### delete
-bash ishtar-delete-instance
+bash ./ishtar-delete-instance
diff --git a/install/ishtar-delete-instance b/install/ishtar-delete-instance
index f622144fe..0cd004de3 100755
--- a/install/ishtar-delete-instance
+++ b/install/ishtar-delete-instance
@@ -52,7 +52,7 @@ do_delete_instance() {
cecho g "++++++ Ishtar instance deletion script ++++++"
cecho g "*******************************************************************************"
echo ""
- echo y "Avalaible instances:"
+ cecho y "Available instances:"
echo ""
cat $INSTANCES_FILE
diff --git a/install/ishtar-install b/install/ishtar-install
index dc4087f6a..defdf7766 100755
--- a/install/ishtar-install
+++ b/install/ishtar-install
@@ -414,7 +414,7 @@ EOF
echo "You can edit "$etc_path"extra_settings.py to add Django settings to all new"
echo "instances.";
echo "";
- cecho y "Next you will have to create an instance with: ishtar-prepare-instance"
+ cecho y "Next you will have to create an instance with: ./ishtar-prepare-instance"
echo "";
}
diff --git a/install/ishtar-prepare-instance b/install/ishtar-prepare-instance
index c86c93497..e7ac1152a 100755
--- a/install/ishtar-prepare-instance
+++ b/install/ishtar-prepare-instance
@@ -312,8 +312,9 @@ EOF
-------------------------------------------------------------------------------
EOF
cecho g " Your instance has been configured."
- cecho g " * instance name: "$INSTANCE
- cecho g " * url: "$URL
+ echo ""
+ cecho g " * instance name: "$INSTANCE
+ cecho g " * url: http://"$URL
cat >&2 <<-'EOF'
@@ -321,7 +322,8 @@ EOF
EOF
cecho y "systemctl restart uwsgi nginx"
echo ""
- echo "And then enjoy ishtar!"
+ echo " And then enjoy ishtar!"
+ echo ""
}
do_install_instance