Merge pull request #6765 from bisq-network/revert-6760-move_bisq_scri…

…pts_to_scripts_directory

Revert "Move bisq-* scripts from root directory to scripts directory"

.gitignore

@@ -23,9 +23,7 @@ build
 *.~ava
 /bundles
 /bisq-*
-/scripts/bisq-*
 /lib
-/scripts/lib
 /xchange
 desktop.ini
 */target/*

Makefile

@@ -190,7 +190,7 @@ bitcoind: .localnet
  -blocknotify='.localnet/bitcoind/blocknotify %s'
 
 seednode: seednode/build
- ./scripts/bisq-seednode \
+ ./bisq-seednode \
  --baseCurrencyNetwork=BTC_REGTEST \
  --useLocalhostForP2P=true \
  --useDevPrivilegeKeys=true \
@@ -203,7 +203,7 @@ seednode: seednode/build
  --appName=seednode
 
 seednode2: seednode/build
- ./scripts/bisq-seednode \
+ ./bisq-seednode \
  --baseCurrencyNetwork=BTC_REGTEST \
  --useLocalhostForP2P=true \
  --useDevPrivilegeKeys=true \
@@ -216,7 +216,7 @@ seednode2: seednode/build
  --appName=seednode2
 
 mediator: desktop/build
- ./scripts/bisq-desktop \
+ ./bisq-desktop \
  --baseCurrencyNetwork=BTC_REGTEST \
  --useLocalhostForP2P=true \
  --useDevPrivilegeKeys=true \
@@ -225,7 +225,7 @@ mediator: desktop/build
  --appName=Mediator
 
 alice: setup
- ./scripts/bisq-desktop \
+ ./bisq-desktop \
  --baseCurrencyNetwork=BTC_REGTEST \
  --useLocalhostForP2P=true \
  --useDevPrivilegeKeys=true \
@@ -240,7 +240,7 @@ alice: setup
  --appName=Alice
 
 bob: setup
- ./scripts/bisq-desktop \
+ ./bisq-desktop \
  --baseCurrencyNetwork=BTC_REGTEST \
  --useLocalhostForP2P=true \
  --useDevPrivilegeKeys=true \

build.gradle

@@ -17,7 +17,7 @@ configure(rootProject) {
  // remove the 'bisq-*' scripts and 'lib' dir generated by the 'installDist' task
  task clean {
  doLast {
- delete fileTree(dir: "$rootProject.projectDir/scripts", include: 'bisq-*'), "$rootProject.projectDir/scripts/lib"
+ delete fileTree(dir: rootProject.projectDir, include: 'bisq-*'), 'lib'
  }
  }
 }
@@ -59,27 +59,27 @@ configure([project(':cli'),
 
  copy {
  from "$destinationDir/bin"
- into "$rootProject.projectDir/scripts"
+ into rootProject.projectDir
  }
  // copy libs required for generated shell script classpaths to 'lib' dir under
  // the project root directory
  copy {
  from "$destinationDir/lib"
- into "${rootProject.projectDir}/scripts/lib"
+ into "${rootProject.projectDir}/lib"
  }
 
  // edit generated shell scripts such that they expect to be executed in the
  // project root dir as opposed to a 'bin' subdirectory
- def windowsScriptFile = file("${rootProject.projectDir}/scripts/bisq-${applicationName}.bat")
+ def windowsScriptFile = file("${rootProject.projectDir}/bisq-${applicationName}.bat")
  windowsScriptFile.text = windowsScriptFile.text.replace(
  'set APP_HOME=%DIRNAME%..', 'set APP_HOME=%DIRNAME%')
 
- def unixScriptFile = file("${rootProject.projectDir}/scripts/bisq-$applicationName")
+ def unixScriptFile = file("${rootProject.projectDir}/bisq-$applicationName")
  unixScriptFile.text = unixScriptFile.text.replace(
  'APP_HOME=$( cd "${APP_HOME:-./}.." && pwd -P ) || exit', 'APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit')
 
  if (applicationName == 'desktop') {
- def script = file("${rootProject.projectDir}/scripts/bisq-$applicationName")
+ def script = file("${rootProject.projectDir}/bisq-$applicationName")
  script.text = script.text.replace(
  'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="-XX:MaxRAM=8g -Xss1280k -XX:+UseG1GC ' +
  '-XX:MaxHeapFreeRatio=10 -XX:MinHeapFreeRatio=5 -XX:+UseStringDeduplication ' +
@@ -90,7 +90,7 @@ configure([project(':cli'),
  // Pass the logback config file as a system property to avoid chatty
  // logback startup due to multiple logback.xml files in the classpath
  // (:daemon & :cli).
- def script = file("${rootProject.projectDir}/scripts/bisq-$applicationName")
+ def script = file("${rootProject.projectDir}/bisq-$applicationName")
  script.text = script.text.replace(
  'DEFAULT_JVM_OPTS=""', 'DEFAULT_JVM_OPTS="' +
  '-Dlogback.configurationFile=apitest/build/resources/main/logback.xml"')