Skip to content

Commit

Permalink
Adapt to changed paths
Browse files Browse the repository at this point in the history
  • Loading branch information
totten committed Jul 21, 2022
1 parent b2d3ddb commit 2ee6c0b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ git clone git://github.com/civicrm/civicrm-upgrade-test.git

## Create and edit a settings file
cd civicrm-upgrade-test
cp civicrm-upgrade-test.settings.txt civicrm-upgrade-test.settings
cp examples/civicrm-upgrade-test.settings.txt civicrm-upgrade-test.settings
vi civicrm-upgrade-test.settings
## Note: The file will include comments on the configuration options
```
Expand All @@ -38,13 +38,13 @@ vi civicrm-upgrade-test.settings

```bash
## Run the script with a single database
bash civicrm-upgrade-test databases/4.2.0-setupsh.sql.bz2
./bin/civicrm-upgrade-test databases/4.2.0-setupsh.sql.bz2

## Run the script with all databases
bash civicrm-upgrade-test databases/*.sql.bz2
./bin/civicrm-upgrade-test databases/*.sql.bz2

## Run the script with any databases based on CiviCRM 4.0.x or 4.1.x
bash civicrm-upgrade-test databases/{4.0,4.1}*.sql.bz2
./bin/civicrm-upgrade-test databases/{4.0,4.1}*.sql.bz2
```

After executing any of the above commands, output will be written to the
Expand Down
3 changes: 2 additions & 1 deletion bin/civicrm-upgrade-test
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,8 @@ function check_error {

SCRIPT_PATH=$(abspath "$0")
SCRIPT_DIR=$(dirname "$SCRIPT_PATH")
SCRIPT_CFG="$SCRIPT_DIR/civicrm-upgrade-test.settings"
PRJ_DIR$(dirname "$SCRIPT_DIR")
SCRIPT_CFG="$PRJ_DIR/civicrm-upgrade-test.settings"
if [ -f "$SCRIPT_CFG" ]; then
source $SCRIPT_CFG
fi
Expand Down

0 comments on commit 2ee6c0b

Please sign in to comment.