WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add preflight merge

This commit is contained in:
Orsiris de Jong 2023-06-11 11:26:02 +02:00
parent d0af0804a0
commit d9e22b06e5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dev/tests/run_tests.sh
View File

@ -200,6 +200,10 @@ function PrepareLocalDirs () {
function oneTimeSetUp () { function oneTimeSetUp () {
START_TIME=$SECONDS START_TIME=$SECONDS
echo "Running forced merge"
cd "${DEV_DIR}"
./merge.sh osync
echo "Running install.sh from ${OSYNC_DIR}" echo "Running install.sh from ${OSYNC_DIR}"
ls -alh ${OSYNC_DIR} ls -alh ${OSYNC_DIR}
$SUDO_CMD ${OSYNC_DIR}/install.sh --prefix="${FAKEROOT}" $SUDO_CMD ${OSYNC_DIR}/install.sh --prefix="${FAKEROOT}"