Temporarily disable merge test
This commit is contained in:
parent
9ade468ed8
commit
edfc292486
|
@ -200,9 +200,9 @@ function PrepareLocalDirs () {
|
||||||
function oneTimeSetUp () {
|
function oneTimeSetUp () {
|
||||||
START_TIME=$SECONDS
|
START_TIME=$SECONDS
|
||||||
|
|
||||||
echo "Running forced merge"
|
#echo "Running forced merge"
|
||||||
cd "${DEV_DIR}"
|
#cd "${DEV_DIR}"
|
||||||
$SUDO_CMD ./merge.sh osync
|
#$SUDO_CMD ./merge.sh osync
|
||||||
echo "Setting security for files"
|
echo "Setting security for files"
|
||||||
$SUDO_CMD find ${OSYNC_DIR} -exec chmod 755 {} \+
|
$SUDO_CMD find ${OSYNC_DIR} -exec chmod 755 {} \+
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue