Skip to content

Commit 09fe426

Browse files
committed
commit: fix for cli plus migrator
1 parent e0f8cd9 commit 09fe426

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

cli/src/commands/wheels/version.cfc

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,19 @@ component aliases="-v,--version" extends="base" {
1313
* @help Show version information
1414
*/
1515
public void function run() {
16-
// Get server information
17-
local.serverInfo = getServerInfo();
18-
19-
print.boldGreenLine("Wheels CLI Module " & getWheelsCliVersion());
20-
print.line("");
21-
print.greenLine("Wheels Version: " & $getWheelsVersion());
22-
print.greenLine("CFML Engine: " & local.serverInfo.name & " " & local.serverInfo.version);
23-
print.greenLine("CommandBox Version: " & shell.getVersion());
16+
try {
17+
// Get server information
18+
local.serverInfo = getServerInfo();
19+
20+
print.boldGreenLine("Wheels CLI Module " & getWheelsCliVersion());
21+
print.line("");
22+
print.greenLine("Wheels Version: " & $getWheelsVersion());
23+
print.greenLine("CFML Engine: " & local.serverInfo.name & " " & local.serverInfo.version);
24+
print.greenLine("CommandBox Version: " & shell.getVersion());
25+
} catch (any e) {
26+
detailOutput.error("#e.message#");
27+
setExitCode(1);
28+
}
2429
}
2530

2631
private struct function getServerInfo() {
@@ -52,7 +57,7 @@ component aliases="-v,--version" extends="base" {
5257

5358
private string function getWheelsCliVersion() {
5459
// Read from CLI module's box.json
55-
local.boxJsonPath = getDirectoryFromPath(getCurrentTemplatePath()) & "../../../box.json";
60+
local.boxJsonPath = expandPath("/wheels-cli/box.json");
5661
if (FileExists(local.boxJsonPath)) {
5762
try {
5863
local.boxJson = DeserializeJSON(FileRead(local.boxJsonPath));

vendor/wheels/public/views/migrator.cfm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,7 @@ function refreshMigrationData() {
442442
$table.css('opacity', '1');
443443
})
444444
.fail(function() {
445-
console.error('Failed to refresh migration data');/
445+
console.error('Failed to refresh migration data');
446446
$table.css('opacity', '1');
447447
});
448448
}

0 commit comments

Comments
 (0)