Skip to content

Commit 8e3c624

Browse files
committed
devonfw#63: Improvements after review
1 parent 195dd09 commit 8e3c624

File tree

5 files changed

+28
-21
lines changed

5 files changed

+28
-21
lines changed

cli/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@
116116
<goal>copy-resources</goal>
117117
</goals>
118118
<configuration>
119-
<outputDirectory>${basedir}/target/package</outputDirectory>
119+
<outputDirectory>${project.build.directory}/package</outputDirectory>
120120
<resources>
121121
<resource>
122122
<directory>src/main/package</directory>

cli/src/main/assembly/exec.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
</fileSet>
2626
<fileSet>
2727
<directory>${project.build.directory}/package</directory>
28-
<outputDirectory>./target/package</outputDirectory>
28+
<outputDirectory>.</outputDirectory>
2929
</fileSet>
3030
</fileSets>
3131
</assembly>

cli/src/main/java/com/devonfw/tools/ide/commandlet/EnvironmentCommandlet.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public String getName() {
3737
@Override
3838
public boolean isIdeHomeRequired() {
3939

40-
return false;
40+
return true;
4141
}
4242

4343
@Override

cli/src/main/package/bin/ide

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
#!/usr/bin/env bash
2+
3+
# Check if arguments are given
4+
if [ -n "${1}" ]; then
5+
# Call native ideasy.exe with user-provided arguments
6+
ideasy "$@"
7+
8+
rc=$?
9+
if [ "${rc}" != 0 ]; then
10+
exit ${rc}
11+
fi
12+
fi
13+
14+
envariable=
15+
if [ "${OSTYPE}" = "cygwin" ] || [ "${OSTYPE}" = "msys" ] ; then
16+
envariable="ideasy env --bash"
17+
else
18+
envariable="ideasy env"
19+
fi
20+
21+
rc=$?
22+
23+
if [ $rc = 0 ]; then
24+
eval "$envariable"
25+
fi

cli/src/main/package/ide

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)