diff --git a/README.md b/README.md index cce7b67b..b0a05b43 100644 --- a/README.md +++ b/README.md @@ -62,6 +62,8 @@ Previously opened sessions are stored as part of application data and they are l - `jlab ../test.py` launch python file with relative path - Open with a custom Python environment - `jlab --python-path /Users/username/custom_env/bin/python ../notebooks/test.ipynb` launch notebook with custom Python environment +- Connect to existing JupyterLab server + - `jlab https://example.org/lab?token=abcde` For additional CLI options run `jlab --help` in command line. diff --git a/Release.md b/Release.md index b07dcc39..e04da82a 100644 --- a/Release.md +++ b/Release.md @@ -37,13 +37,12 @@ In order to change the JupyterLab version bundled with the application: ```bash yarn create_env_installer:osx-64 && yarn update_binary_sign_list --platform osx-64 ``` + ```bash yarn create_env_installer:osx-arm64 && yarn update_binary_sign_list --platform osx-arm64 ``` -4. If python version is updated in [`env_installer/jlab_server.yaml`](env_installer/jlab_server.yaml), also update `pythonBin` variables in [`util.ts`](src/main/utils.ts) that are used in code signing related methods. - -5. Update `ipywidgets` python package version in [`env_installer/jlab_server.yaml`](env_installer/jlab_server.yaml) if there is a compatible newer version available. +4. Update `ipywidgets` python package version in [`env_installer/jlab_server.yaml`](env_installer/jlab_server.yaml) if there is a compatible newer version available. Note that after updating the bundled JupyterLab version, it is necessary to bump JupyterLab Desktop version using `tbump` as described in the section below. Run `check_version_match` script before committing the changes to ensure version integrity. diff --git a/src/main/utils.ts b/src/main/utils.ts index 5800df29..9cb52cff 100644 --- a/src/main/utils.ts +++ b/src/main/utils.ts @@ -499,7 +499,6 @@ export function createCommandScriptInEnv( back to ad-hoc signed. */ export function createUnsignScriptInEnv(envPath: string): string { - const pythonBin = 'bin/python3.8'; const appDir = getAppDir(); const signListFile = path.join( appDir, @@ -510,17 +509,15 @@ export function createUnsignScriptInEnv(envPath: string): string { const signList: string[] = []; fileContents.split(/\r?\n/).forEach(line => { - if (line && line !== pythonBin) { + if (line) { signList.push(`"${line}"`); } }); - // remove hardened runtime flag, convert to ad-hoc - const removeRuntimeFlagCommand = `codesign -s - -o 0x2 -f ${pythonBin}`; - - return `cd ${envPath} && codesign --remove-signature ${signList.join( + // sign all binaries with ad-hoc signature + return `cd ${envPath} && codesign -s - -o 0x2 -f ${signList.join( ' ' - )} && ${removeRuntimeFlagCommand} && cd -`; + )} && cd -`; } export function getLogFilePath(processType: 'main' | 'renderer' = 'main') {