Révision 2797

tmp/org.txm.statsengine.r.core/src/org/txm/statsengine/r/core/preferences/RPreferences.java (revision 2797)
128 128 
		File rpluginDir = new File(bundleDir, "res"); //$NON-NLS-1$
129 129 
		File rRootDir = new File(rpluginDir, os);
130 130 
		File execFile = new File(rRootDir, "bin/" + extraSubPath + "R" + ext); //$NON-NLS-1$ //$NON-NLS-2$
131
131 
		File execFile2 = new File(rRootDir, "bin/exec/" + extraSubPath + "R" + ext); //$NON-NLS-1$ //$NON-NLS-2$
132 
		if (osName.contains("windows")) { // R second exec file path is different
133 
			execFile2 = new File(rRootDir, "bin/x64/" + extraSubPath + "R" + ext); //$NON-NLS-1$ //$NON-NLS-2$
134 
		}
132 135 
		if (!execFile.canExecute() && !execFile.setExecutable(true)) { // first test if file is executable then try setting it executable
133 136 
			Log.warning(TXMCoreMessages.bind("Error while setting execution file rights to: {0}.", execFile.getAbsolutePath()));
134 137 
		}
135 138
139 
		if (!execFile2.canExecute() && !execFile2.setExecutable(true)) { // first test if file is executable then try setting it executable
140 
			Log.warning(TXMCoreMessages.bind("Error while setting execution file rights to: {0}.", execFile2.getAbsolutePath()));
141 
		}
142
136 143 
		if (!osName.contains("windows") && !execFile.canExecute()) {  //$NON-NLS-1$
137 144 
			try {
138 145 
				Log.fine(TXMCoreMessages.bind("Setting execution file rights to: {0}.", rRootDir.getAbsolutePath()));

Formats disponibles : Unified diff