diff --git a/.github/workflows/generate-docs-main.yml b/.github/workflows/generate-docs-main.yml index 1ee78b67..c052bf92 100644 --- a/.github/workflows/generate-docs-main.yml +++ b/.github/workflows/generate-docs-main.yml @@ -45,7 +45,7 @@ jobs: - name: Build Documentation run: | pwd - cathy build docs -J + cathy build docs -I - name: Check Python venv 1 run: ls @@ -57,21 +57,20 @@ jobs: run: ls env/docs - name: Check Python venv 4 - run: ls env/docs/Scripts + run: ls env/docs/bin - - # - name: Copy index referrer - # run: cp data/wf-gen-docs/index.html ./docs/build/. + - name: Copy index referrer + run: cp data/wf-gen-docs/index.html ./docs/build/. - # - name: List docs folder - # run: ls docs/build + - name: List docs folder + run: ls docs/build - # - name: Deploy - # uses: peaceiris/actions-gh-pages@v3 - # with: - # publish_branch: gh-pages - # github_token: ${{ secrets.GITHUB_TOKEN }} - # publish_dir: docs/build/ - # force_orphan: true + - name: Deploy + uses: peaceiris/actions-gh-pages@v3 + with: + publish_branch: gh-pages + github_token: ${{ secrets.GITHUB_TOKEN }} + publish_dir: docs/build/ + force_orphan: true - run: echo "🍏 This job's status is ${{ job.status }}." diff --git a/src/catharsys/setup/util.py b/src/catharsys/setup/util.py index 475b9ca5..60e5db72 100644 --- a/src/catharsys/setup/util.py +++ b/src/catharsys/setup/util.py @@ -28,6 +28,7 @@ import io import os import sys +import platform import subprocess import typing import json @@ -233,8 +234,13 @@ def ExecShellCmd( sEffCmd = "" if pathVirtEnv is not None: - pathAct = pathVirtEnv / "Scripts" / "activate" - sEffCmd = "{} & ".format(str(pathAct)) + if platform.system() == "Windows": + pathAct = pathVirtEnv / "Scripts" / "activate.bat" + sEffCmd = "{} & ".format(str(pathAct)) + else: + pathAct = pathVirtEnv / "bin" / "activate" + sEffCmd = "source {} && ".format(str(pathAct)) + # endif # endif sEffCmd += sCmd