Skip to content

Commit 955d2a7

Browse files
committed
Updating the paths
Updated the paths from vendor/cfwheels to vendor/wheels to accommodate for the name change of the folder from cfwheels to wheels
1 parent 72749f0 commit 955d2a7

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

commands/wheels/base.cfc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,16 @@ component excludeFromHelp=true {
1818
// we could also test for the existence of /wheels/dbmigrate, but that only gives us the major version.
1919
string function $getWheelsVersion(){
2020
// First, look for a wheels folder..
21-
if(!directoryExists( fileSystemUtil.resolvePath("vendor/cfwheels") ) ){
22-
error("We're currently looking in #getCWD()#, but can't find a /cfwheels/ folder?");
21+
if(!directoryExists( fileSystemUtil.resolvePath("vendor/wheels") ) ){
22+
error("We're currently looking in #getCWD()#, but can't find a /wheels/ folder?");
2323
}
24-
if(fileExists(fileSystemUtil.resolvePath("vendor/cfwheels/box.json"))){
25-
var output = command( 'cd vendor\cfwheels' ).run( returnOutput=true );
24+
if(fileExists(fileSystemUtil.resolvePath("vendor/wheels/box.json"))){
25+
var output = command( 'cd vendor\wheels' ).run( returnOutput=true );
2626
local.boxJSON = packageService.readPackageDescriptorRaw( getCWD() );
2727
var output = command( 'cd ../' ).run( returnOutput=true );
2828
return local.boxJSON.version;
29-
} else if(fileExists(fileSystemUtil.resolvePath("vendor/cfwheels/events/onapplicationstart.cfm"))) {
30-
var output = command( 'cd vendor\cfwheels' ).run( returnOutput=true );
29+
} else if(fileExists(fileSystemUtil.resolvePath("vendor/wheels/events/onapplicationstart.cfm"))) {
30+
var output = command( 'cd vendor\wheels' ).run( returnOutput=true );
3131
local.target=fileSystemUtil.resolvePath("app/events/onapplicationstart.cfm");
3232
local.content=fileRead(local.target);
3333
local.content=listFirst(mid(local.content, (find('application.$wheels.version',local.content)+31),20),'"');
@@ -208,7 +208,7 @@ component excludeFromHelp=true {
208208
}
209209

210210
// Wheels folder in expected place? (just a good check to see if the user has actually installed wheels...)
211-
var wheelsFolder=fileSystemUtil.resolvePath("vendor/cfwheels");
211+
var wheelsFolder=fileSystemUtil.resolvePath("vendor/wheels");
212212
if(!directoryExists(wheelsFolder)){
213213
error("We can't find your wheels folder. Check you have installed CFWheels, and you're running this from the site root: If you've not started an app yet, try wheels new myApp");
214214
}

commands/wheels/init.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ component extends="base" {
3636
}
3737

3838
var serverJsonLocation=fileSystemUtil.resolvePath("server.json");
39-
var wheelsBoxJsonLocation=fileSystemUtil.resolvePath("vendor/cfwheels/box.json");
39+
var wheelsBoxJsonLocation=fileSystemUtil.resolvePath("vendor/wheels/box.json");
4040
var boxJsonLocation=fileSystemUtil.resolvePath("box.json");
4141

4242
var wheelsVersion = $getWheelsVersion();

interceptors/postInstall.cfc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ component {
2121

2222
function postInstall( required struct interceptData ) {
2323
var pluginFolder = fileSystemUtil.resolvePath("app/plugins");
24-
var isValidWheelsInstallation = directoryExists( fileSystemUtil.resolvePath("vendor/cfwheels")) ? true:false;
24+
var isValidWheelsInstallation = directoryExists( fileSystemUtil.resolvePath("vendor/wheels")) ? true:false;
2525
var isValidPluginsDirectory = directoryExists( pluginFolder ) ? true:false;
2626

2727
if(isValidWheelsInstallation && isValidPluginsDirectory){

0 commit comments

Comments
 (0)