Skip to content

Commit

Permalink
Remove bin/omero
Browse files Browse the repository at this point in the history
  • Loading branch information
joshmoore committed Jan 6, 2020
1 parent 6617270 commit d54e2cf
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion 50-config.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@


CONFIG_OMERO = '/opt/omero/server/config/omero-server-config-update.sh'
OMERO = '/opt/omero/server/OMERO.server/bin/omero'
OMERO = '/opt/omero/server/venv3/bin/omero'

if os.access(CONFIG_OMERO, os.X_OK):
rc = call([CONFIG_OMERO])
Expand Down
2 changes: 1 addition & 1 deletion 60-database.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

set -eu

omero=/opt/omero/server/OMERO.server/bin/omero
omero=/opt/omero/server/venv3/bin/omero
omego=/opt/omero/server/venv3/bin/omego
cd /opt/omero/server

Expand Down
2 changes: 1 addition & 1 deletion 99-run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

set -eu

omero=/opt/omero/server/OMERO.server/bin/omero
omero=/opt/omero/server/venv3/bin/omero
cd /opt/omero/server
echo "Starting OMERO.server"
exec $omero admin start --foreground
2 changes: 1 addition & 1 deletion test_dropbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -x
# Must be exported by the caller:
# OMERO_USER OMERO_PASS PREFIX

OMERO=/opt/omero/server/OMERO.server/bin/omero
OMERO=/opt/omero/server/venv3/bin/omero
FILENAME=$(date +%Y%m%d-%H%M%S-%N).fake
SERVER=localhost:4064
docker exec $PREFIX-server sh -c \
Expand Down
2 changes: 1 addition & 1 deletion test_login.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -x
# Must be exported by the caller:
# OMERO_USER OMERO_PASS PREFIX

OMERO=/opt/omero/server/OMERO.server/bin/omero
OMERO=/opt/omero/server/venv3/bin/omero
SERVER="localhost:4064"

# Wait up to 2 mins
Expand Down
2 changes: 1 addition & 1 deletion test_processor.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set -x
# Must be exported by the caller:
# OMERO_USER OMERO_PASS PREFIX

OMERO=/opt/omero/server/OMERO.server/bin/omero
OMERO=/opt/omero/server/venv3/bin/omero
DSNAME=$(date +%Y%m%d-%H%M%S-%N)
FILENAME=$(date +%Y%m%d-%H%M%S-%N).fake
SCRIPT=/omero/util_scripts/Dataset_To_Plate.py
Expand Down

0 comments on commit d54e2cf

Please sign in to comment.