diff --git a/services/git-bridge/.gitignore b/services/git-bridge/.gitignore index 7bf222c561..e90f3aaf1a 100644 --- a/services/git-bridge/.gitignore +++ b/services/git-bridge/.gitignore @@ -1,3 +1,2 @@ target/ -*.jar .idea/workspace.xml diff --git a/services/git-bridge/.idea/libraries/betamax_core.xml b/services/git-bridge/.idea/libraries/betamax_core.xml deleted file mode 100644 index 2b4ff458a2..0000000000 --- a/services/git-bridge/.idea/libraries/betamax_core.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/.idea/libraries/betamax_junit.xml b/services/git-bridge/.idea/libraries/betamax_junit.xml deleted file mode 100644 index b21c3a3be6..0000000000 --- a/services/git-bridge/.idea/libraries/betamax_junit.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/services/git-bridge/README.md b/services/git-bridge/README.md index 128e2b32e5..46901b249d 100644 --- a/services/git-bridge/README.md +++ b/services/git-bridge/README.md @@ -9,13 +9,13 @@ Required Installation ------------ ### Ubuntu ### -Run `sudo install.sh` to get dependencies, build, test, package, and make it a service. +Run `sudo ./install.sh` to get dependencies, build, test, package, and make it a service. Use `sudo service wlgb start` and `sudo service wlgb stop` to start and stop the server. The configuration file will be at `/etc/wlgb/config.json`. -Run `sudo uninstall.sh` to undo what `sudo install.sh` did. +Run `sudo ./uninstall.sh` to undo what `sudo ./install.sh` did. ### Manually ### Run `mvn package` to build, test, and package it into a jar at `target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar`. diff --git a/services/git-bridge/install.sh b/services/git-bridge/install.sh index 47aa36973a..ed1cbd3a4f 100755 --- a/services/git-bridge/install.sh +++ b/services/git-bridge/install.sh @@ -1,21 +1,19 @@ -if [ "$(id -u)" != "0" ]; then - echo "You must be root to install" 1>&2 - exit 1 -fi -command -v ant >/dev/null 2>&1 && command -v /usr/lib/jvm/java-7-openjdk-amd64/bin/javac >/dev/null 2>&1 || installDeps() +command -v ant >/dev/null 2>&1 && command -v /usr/lib/jvm/java-7-openjdk-amd64/bin/javac >/dev/null 2>&1 || installDeps mvn package &&\ -mv ./target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar /usr/local/sbin/ &&\ -cp ./bin/wlgb /etc/init.d/ &&\ -mkdir -p /var/log/wlgb &&\ -mkdir -p /etc/wlgb &&\ -cp ./bin/config.json /etc/wlgb/ &&\ -/usr/sbin/update-rc.d -f wlgb defaults +sudo mv ./target/writelatex-git-bridge-1.0-SNAPSHOT-jar-with-dependencies.jar /usr/local/sbin/writelatex-git-bridge.jar &&\ +sudo cp ./bin/wlgb /etc/init.d/ &&\ +sudo mkdir -p /var/log/wlgb &&\ +sudo mkdir -p /etc/wlgb &&\ +if [ -f /etc/wlgb/config.json ]; then + sudo cp ./bin/config.json /etc/wlgb/ +fi &&\ +sudo /usr/sbin/update-rc.d -f wlgb defaults installDeps() { - apt-get update - apt-get install -y maven2 - apt-get install -y openjdk-7-jdk - update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java - update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/javac + sudo apt-get update + sudo apt-get install -y maven2 + sudo apt-get install -y openjdk-7-jdk + sudo update-alternatives --set java /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java + sudo update-alternatives --set javac /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/javac return 1 } diff --git a/services/git-bridge/uninstall.sh b/services/git-bridge/uninstall.sh index 107fa7c2f6..8ada2b0f99 100755 --- a/services/git-bridge/uninstall.sh +++ b/services/git-bridge/uninstall.sh @@ -1,8 +1,4 @@ -if [ "$(id -u)" != "0" ]; then - echo "You must be root to uninstall" 1>&2 - exit 1 -fi -rm -f /usr/local/sbin/writelatex-git-bridge.jar &&\ -rm -f /etc/init.d/wlgb &&\ -rm -rf /etc/wlgb -/usr/sbin/update-rc.d -f wlgb remove +sudo rm -f /usr/local/sbin/writelatex-git-bridge.jar &&\ +sudo rm -f /etc/init.d/wlgb &&\ +sudo rm -rf /etc/wlgb +sudo /usr/sbin/update-rc.d -f wlgb remove diff --git a/services/git-bridge/writelatex-git-bridge.iml b/services/git-bridge/writelatex-git-bridge.iml index b5203d9ca2..309e9c3214 100644 --- a/services/git-bridge/writelatex-git-bridge.iml +++ b/services/git-bridge/writelatex-git-bridge.iml @@ -15,8 +15,6 @@ - -