Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed the error "arch: brew not found in PATH" while installing driver #662

Merged
merged 1 commit into from
Nov 19, 2022
+101 −67
Merged

Fixed the error "arch: brew not found in PATH" while installing driver #662

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
99 changes: 65 additions & 34 deletions app/scripts/services/drivers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,9 +375,35 @@ angular.module('icestudio')
function disableDarwinDriversSerial() {
disableDarwinDrivers();
}
function returnBrewPath(){
const result = require('child_process').execSync('uname -a').toString().trim().toLowerCase();
return (result.indexOf('arm64')>0) ? 'arch -arm64 brew' : 'brew';
function returnBrewPath() {
const fs = require('fs');

const possibleBrewPaths = [
'/usr/local/bin/brew',
'/opt/homebrew/bin/brew'
];

let brewPath = 'brew';
try {
for (let checkPath of possibleBrewPaths) {
if (fs.existsSync(checkPath)) {
brewPath = checkPath;
break;
}
}

if (typeof common.DEBUGMODE !== 'undefined' && common.DEBUGMODE === 1) {
fs.appendFileSync(common.LOGFILE, 'Found homebrew in path: ' + brewPath + "\n");
}
} catch (error) {
if (typeof common.DEBUGMODE !== 'undefined' && common.DEBUGMODE === 1) {
fs.appendFileSync(common.LOGFILE, 'Error detecting brew path:' + "\n");
fs.appendFileSync(common.LOGFILE, error + "\n");
}
}

const arch = nodeChildProcess.execSync('uname -a').toString().trim().toLowerCase();
return (arch.indexOf('arm64') > 0) ? 'arch -arm64 ' + brewPath : brewPath;
}

function enableDarwinDrivers(brewPackages, profileSetting) {
Expand All @@ -397,46 +423,51 @@ angular.module('icestudio')
fs.appendFileSync(common.LOGFILE, 'BREW COMMANDS:::' + "\n");
fs.appendFileSync(common.LOGFILE, JSON.stringify(brewCommands));
}

nodeChildProcess.exec(brewCommands.join('; '), function (error, stdout, stderr) {
if (typeof common.DEBUGMODE !== 'undefined' &&
common.DEBUGMODE === 1) {
const fs = require('fs');
fs.appendFileSync(common.LOGFILE, 'STDERR ' + stderr + "\n");

fs.appendFileSync(common.LOGFILE, 'STDERR ' + stdout + "\n");
}
if (error) {
if ((stderr.indexOf('brew: command not found') !== -1) ||
(stderr.indexOf('brew: No such file or directory') !== -1)) {
alertify.warning(gettextCatalog.getString('{{app}} is required.', { app: '<b>Homebrew</b>' }) + '<br>' +
'<u>' + gettextCatalog.getString('Click here to install it') + '</u>', 30)
.callback = function (isClicked) {
try {
nodeChildProcess.exec(brewCommands.join('; '), function (error, stdout, stderr) {
if (typeof common.DEBUGMODE !== 'undefined' &&
common.DEBUGMODE === 1) {
const fs = require('fs');
fs.appendFileSync(common.LOGFILE, 'STDERR ' + stderr + "\n");

fs.appendFileSync(common.LOGFILE, 'STDERR ' + stdout + "\n");
}
if (error) {
if ((stderr.indexOf('brew: command not found') !== -1) ||
(stderr.indexOf('brew: No such file or directory') !== -1)) {
alertify.warning(gettextCatalog.getString('{{app}} is required.', {app: '<b>Homebrew</b>'}) + '<br>' +
'<u>' + gettextCatalog.getString('Click here to install it') + '</u>', 30)
.callback = function (isClicked) {
if (isClicked) {
gui.Shell.openExternal('https://brew.sh');
}
};
} else if (stderr.indexOf('Error: Failed to download') !== -1) {
alertify.error(gettextCatalog.getString('Internet connection required'), 30);
} else {
alertify.error(stderr, 30);
}
} else {
if (profileSetting) {
profile.set(profileSetting, true);
}
alertify.success(gettextCatalog.getString('Drivers enabled'));
}
else if (stderr.indexOf('Error: Failed to download') !== -1) {
alertify.error(gettextCatalog.getString('Internet connection required'), 30);
}
else {
alertify.error(stderr, 30);
}
utils.endBlockingTask();
});
if (typeof common.DEBUGMODE !== 'undefined' &&
common.DEBUGMODE === 1) {
const fs = require('fs');
fs.appendFileSync(common.LOGFILE, '/drivers.enableDarwinDrivers' + "\n");
}
else {
if (profileSetting) {
profile.set(profileSetting, true);
}
alertify.success(gettextCatalog.getString('Drivers enabled'));
} catch (error) {
if (typeof common.DEBUGMODE !== 'undefined' && common.DEBUGMODE === 1) {
const fs = require('fs');
fs.appendFileSync(common.LOGFILE, 'Error installing driver: ' + error + "\n");
}
alertify.error('Error installing driver: ' + "\n" + error);
utils.endBlockingTask();
});
if (typeof common.DEBUGMODE !== 'undefined' &&
common.DEBUGMODE === 1) {
const fs = require('fs');
fs.appendFileSync(common.LOGFILE, '/drivers.enableDarwinDrivers' + "\n");

}
}

Expand Down
64 changes: 32 additions & 32 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"version": "0.9.2w",
"description": "Visual editor for open FPGA boards",
"contributors": [
{
{
"name": "Carlos Venegas Arrabe",
"url": "https://github.com/cavearr"
},
Expand Down Expand Up @@ -49,5 +49,8 @@
},
"darwinDependencies": {
"grunt-appdmg": "https://github.com/agoodney/grunt-appdmg.git"
},
"dependencies": {
"grunt-appdmg": "github:agoodney/grunt-appdmg"
}
}