Skip to content

Commit

Permalink
devonfw#63: Improvements after review
Browse files Browse the repository at this point in the history
  • Loading branch information
aBega2000 committed Mar 4, 2024
1 parent 195dd09 commit 8e3c624
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 21 deletions.
2 changes: 1 addition & 1 deletion cli/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<goal>copy-resources</goal>
</goals>
<configuration>
<outputDirectory>${basedir}/target/package</outputDirectory>
<outputDirectory>${project.build.directory}/package</outputDirectory>
<resources>
<resource>
<directory>src/main/package</directory>
Expand Down
2 changes: 1 addition & 1 deletion cli/src/main/assembly/exec.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
</fileSet>
<fileSet>
<directory>${project.build.directory}/package</directory>
<outputDirectory>./target/package</outputDirectory>
<outputDirectory>.</outputDirectory>
</fileSet>
</fileSets>
</assembly>
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public String getName() {
@Override
public boolean isIdeHomeRequired() {

return false;
return true;
}

@Override
Expand Down
25 changes: 25 additions & 0 deletions cli/src/main/package/bin/ide
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
#!/usr/bin/env bash

# Check if arguments are given
if [ -n "${1}" ]; then
# Call native ideasy.exe with user-provided arguments
ideasy "$@"

rc=$?
if [ "${rc}" != 0 ]; then
exit ${rc}
fi
fi

envariable=
if [ "${OSTYPE}" = "cygwin" ] || [ "${OSTYPE}" = "msys" ] ; then
envariable="ideasy env --bash"
else
envariable="ideasy env"
fi

rc=$?

if [ $rc = 0 ]; then
eval "$envariable"
fi
18 changes: 0 additions & 18 deletions cli/src/main/package/ide

This file was deleted.

0 comments on commit 8e3c624

Please sign in to comment.