This repository was archived by the owner on Aug 10, 2020. It is now read-only.

Commit f06bd15

committed

Cleanup script and add update functionality

Signed-off-by: Mriyam Tamuli <mbtamuli@gmail.com>

1 parent 8506378 commit f06bd15Copy full SHA for f06bd15

File tree

-11

lines changed

-11

lines changed

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -277,8 +277,8 @@ initEE4() {`
`277`	`277`	`fi`
`278`	`278`
`279`	`279`	`if [[ $# -eq 0 ]]; then`
`280`		`- read -p "Where would you like to create your sites(default: ~/Documents/Sites): "`
`281`		`- WEBROOT="${REPLY:-~/Documents/Sites}"`
	`280`	`+ read -p "Where would you like to create your sites(default: ~/Sites): "`
	`281`	`+ WEBROOT="${REPLY:-~/Sites}"`
`282`	`282`	`elif [[ $# -eq 1 ]]; then`
`283`	`283`	`WEBROOT="1ドル"`
`284`	`284`	`fi`
`@@ -289,12 +289,13 @@ initEE4() {`
`289`	`289`	`updateEE4() {`
`290`	`290`	`REPO_URL="${1:-https://github.com/EasyEngine/docker-compose-wordpress}"`
`291`	`291`	`VERSION="${2:-master}"`
	`292`	`+ EE_TMP_ROOT="$(mktemp -dt ee-installer-XXXXXX)"`
	`293`	`+ EE_TMP_REPO="$EE_TMP_ROOT/docker-compose-wordpress"`
`292`	`294`
`293`		`- echo "git pull -b "$VERSION" "$REPO_URL""`
`294`		`-`
`295`		`- pushd "$EE_INSTALL_DIR" > /dev/null 2>&1`
`296`		`- git pull "$REPO_URL" "$VERSION"`
`297`		`- popd > /dev/null 2>&1`
	`295`	`+ echo "Updating ee4"`
	`296`	`+ git clone -b "$VERSION" "$REPO_URL" "$EE_TMP_REPO"`
	`297`	`+ runAsRoot cp -r "$EE_TMP_REPO/*" "$EE_INSTALL_DIR"`
	`298`	`+ rm -rf "$EE_TMP_ROOT"`
`298`	`299`	`}`
`299`	`300`
`300`	`301`	`# Execution`

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,6 @@ cloneRepo() {`
`71`	`71`	`EE_TMP_REPO="$EE_TMP_ROOT/docker-compose-wordpress"`
`72`	`72`	`echo "Clone repo $REPO_URL"`
`73`	`73`	`git clone -b "$VERSION" "$REPO_URL" "$EE_TMP_REPO"`
`74`		`- ls -al "$EE_TMP_REPO"`
`75`	`74`	`}`
`76`	`75`
`77`	`76`	`# installScript installs the main script.`
`@@ -86,9 +85,7 @@ installScript() {`
`86`	`85`
`87`	`86`	`rm -rf "$EE_INSTALL_DIR"`
`88`	`87`	`echo "Preparing to install into $EE_INSTALL_DIR"`
`89`		`- ls -al "$EE_TMP_REPO"`
`90`	`88`	`runAsRoot cp -r "$EE_TMP_REPO" "$EE_INSTALL_DIR"`
`91`		`- ls -al "$EE_INSTALL_DIR"`
`92`	`89`	`runAsRoot ln -s "$EE_INSTALL_DIR/$EE_SCRIPT" "$EE_SCRIPT_INSTALL_PATH"`
`93`	`90`	`echo -e "\nInstall complete!"`
`94`	`91`	`initEE4`
`@@ -120,4 +117,4 @@ if ! testInstalled; then`
`120`	`117`	`cloneRepo`
`121`	`118`	`installScript`
`122`	`119`	`fi`
`123`		`-#cleanup`
	`120`	`+cleanup`

Comments

(0)