Permalink
Browse files

Merge pull request #1 from therouv/master

Version Cleanup
  • Loading branch information...
mzeis committed Jul 14, 2012
2 parents c18a0a9 + 60d277d commit 78ec17ffc33051ceab8eb70063b670546e77211e
Showing with 49 additions and 28 deletions.
  1. +9 −10 README.markdown
  2. +40 −18 install
View
@@ -42,26 +42,25 @@ This is how it looks like on my VM:
4) CE 1.6.0.0
5) CE 1.6.1.0
6) CE 1.6.2.0
- 7) CE 1.7.0.0 alpha1
- 8) CE 1.7.0.0 beta1
- Enter the number (e.g. 1): 8
- CE 1.7.0.0 beta1 selected.
+ 7) CE 1.7.0.2
+ Enter the number (e.g. 1): 7
+ CE 1.7.0.2 selected.
Specify the shop name. It may be used for the URL, directory and database name, so don't use spaces, special characters or the like.
- Shop name (default: shop): 1700beta1
+ Shop name (default: shop): 1702
Thanks, the required information was provided. The installation will now begin.
Downloading Magento package...
- --2012-03-04 12:32:13-- http://www.magentocommerce.com/downloads/assets/1.7.0.0-beta1/magento-1.7.0.0-beta1.tar.gz
+ --2012-03-04 12:32:13-- http://www.magentocommerce.com/downloads/assets/1.7.0.2/magento-1.7.0.2.tar.gz
Auflösen des Hostnamen www.magentocommerce.com... 209.15.239.51
Verbindungsaufbau zu www.magentocommerce.com|209.15.239.51|:80... verbunden.
HTTP-Anforderung gesendet, warte auf Antwort... 200 OK
Länge: 17653068 (17M) [application/x-gzip]
- In »magento-1.7.0.0-beta1.tar.gz« speichern.
+ In »magento-1.7.0.2.tar.gz« speichern.
100%[===================================================================================================================>] 17.653.068 1,75M/s in 15s
- 2012-03-04 12:32:28 (1,13 MB/s) - »magento-1.7.0.0-beta1.tar.gz« gespeichert [17653068/17653068]
+ 2012-03-04 12:32:28 (1,13 MB/s) - »magento-1.7.0.2.tar.gz« gespeichert [17653068/17653068]
Package downloaded.
@@ -95,12 +94,12 @@ This is how it looks like on my VM:
If you didn't see any error messages, everything went fine.
Set up your vhost config and host entries (if needed) and you are ready to go!
- The frontend shop URL is http://1700beta1.magentoshops.vm.
+ The frontend shop URL is http://1702.magentoshops.vm.
After the script has finished, you may be two steps away from using the new Magento installation:
- 1. **Add an entry two your hosts file**. Your browser has to know which server the domain (e.g. 1700beta1.magentoshops.vom) belongs to. If you use a real domain and have set an wildcard DNS record, then you are good to go. Otherwise, open your hosts file and a line like `192.168.1.2 1700beta1.magentoshops.vm` (don't forget to change this to the correct IP and domain).
+ 1. **Add an entry two your hosts file**. Your browser has to know which server the domain (e.g. 1702.magentoshops.vm) belongs to. If you use a real domain and have set an wildcard DNS record, then you are good to go. Otherwise, open your hosts file and a line like `192.168.1.2 1702.magentoshops.vm` (don't forget to change this to the correct IP and domain).
2. **Add an entry to your server configuration**. Your web server has to know how to handle the request. Normally, you would have to add a [Virtual Host](http://httpd.apache.org/docs/2.2/vhosts/name-based.html) every single time you setup a new Magento installation.
View
58 install
@@ -77,17 +77,14 @@ PHP=$(which php) || { echo 'PHP executable not found'; exit 1; }
SED=$(which sed) || { echo 'sed command not found'; exit 1; }
-
echo "Which version do you want to install?"
echo "1) None, abort installation"
echo "2) CE 1.5.0.1"
echo "3) CE 1.5.1.0"
echo "4) CE 1.6.0.0"
echo "5) CE 1.6.1.0"
echo "6) CE 1.6.2.0"
-echo "7) CE 1.7.0.0 alpha1"
-echo "8) CE 1.7.0.0 beta1"
-echo "9) CE 1.7.0.0 rc1"
+echo "7) CE 1.7.0.2"
while true; do
read -p "Enter the number (e.g. 1): " MAGE_VERSION
@@ -123,18 +120,8 @@ while true; do
break
;;
7)
- echo -e "CE 1.7.0.0 alpha1 selected.\n"
- MAGE_DOWNLOAD_URL="http://www.magentocommerce.com/downloads/assets/1.7.0.0-alpha1/magento-1.7.0.0-alpha1.tar.gz"
- break
- ;;
- 8)
- echo -e "CE 1.7.0.0 beta1 selected.\n"
- MAGE_DOWNLOAD_URL="http://www.magentocommerce.com/downloads/assets/1.7.0.0-beta1/magento-1.7.0.0-beta1.tar.gz"
- break
- ;;
- 9)
- echo -e "CE 1.7.0.0 rc1 selected.\n"
- MAGE_DOWNLOAD_URL="http://www.magentocommerce.com/downloads/assets/1.7.0.0-rc1/magento-1.7.0.0-rc1.tar.gz"
+ echo -e "CE 1.7.0.2 selected.\n"
+ MAGE_DOWNLOAD_URL="http://www.magentocommerce.com/downloads/assets/1.7.0.2/magento-1.7.0.2.tar.gz"
break
;;
*)
@@ -143,6 +130,7 @@ while true; do
esac
done
+
echo "Specify the shop name. It may be used for the URL, directory and database name, so don't use spaces, special characters or the like."
read -p "Shop name (default: ${MAGE_DEFAULT_NAME}): " MAGE_NAME
MAGE_NAME=${MAGE_NAME:-${MAGE_DEFAULT_NAME}}
@@ -158,8 +146,42 @@ DB_SQL="CREATE DATABASE IF NOT EXISTS ${DB_NAME} CHARACTER SET utf8 COLLATE utf8
echo -e "Thanks, the required information was provided. The installation will now begin.\n"
cd $MAGE_BASE_DIR
-echo "Downloading Magento package..."
-wget $MAGE_DOWNLOAD_URL
+
+echo "How do you want to download the Magento package?"
+echo "1) None, abort installation"
+echo "2) wget"
+echo "3) curl"
+
+while true; do
+ read -p "Enter the number (e.g. 2): " DOWNLOAD_METHOD
+
+ case "$DOWNLOAD_METHOD" in
+ 1)
+ echo "Aborting installation."
+ exit;
+ ;;
+ 2)
+ echo " "
+ echo "Downloading Magento package..."
+ echo " "
+ wget $MAGE_DOWNLOAD_URL
+ break
+ ;;
+ 3)
+ echo " "
+ echo "Downloading Magento package..."
+ echo " "
+ curl -O $MAGE_DOWNLOAD_URL
+ break
+ ;;
+ *)
+ echo -e "Invalid option, please try again.\n"
+ ;;
+ esac
+done
+
+
+
echo -e "Package downloaded.\n"
echo "Unpacking package and setting permissions."

0 comments on commit 78ec17f

Please sign in to comment.