From c7562173bc228e9345aac98d8cf8f19715acd210 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20A=2E=20Matienzo?= Date: Thu, 3 Apr 2025 16:42:08 -0700 Subject: [PATCH 1/2] allocate a pseudotty for dvuploader python-dvuploader uses typer, which gives fancy progress bars, etc.; without a pseudotty, the output doesn't auto update or get the nice color formatting. --- README.md | 3 ++- scripts/dvuploader.sh | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 836c638..6031c25 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Dataverse -> /srv/dataverse-prod ## Permissions -You don't necessarily want to give docker rights to users of this script, since docker implies root permissions. You can extend a limited ability to run the script with the following workaround: +You don't necessarily want to give docker rights to users of this script, since docker implies root permissions. You can extend a limited ability to run the script with the following workaround (see [`scripts`](scripts)): ```sh # In system-wide profile @@ -22,6 +22,7 @@ alias dvuploader="sudo /usr/local/sbin/dvuploader.sh" # In /usr/local/sbin/dvuploader.sh #!/bin/sh -e exec docker run \ + -t \ --init \ --rm \ --volume /srv/da:/srv/da:ro \ diff --git a/scripts/dvuploader.sh b/scripts/dvuploader.sh index 1e5809c..7a7292d 100755 --- a/scripts/dvuploader.sh +++ b/scripts/dvuploader.sh @@ -1,5 +1,6 @@ #!/bin/sh -e exec docker run \ + -t \ --init \ --rm \ --volume /srv/da:/srv/da:ro \ From 1da278513e37a1a2610c8993fb0165951e414081 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20A=2E=20Matienzo?= Date: Wed, 16 Apr 2025 09:16:22 -0700 Subject: [PATCH 2/2] upgrade to python-dvuploader 0.3.0 --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1890f7f..910d119 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1 @@ -# once dvuploader 0.3.0 is out, point this to a proper release spec -dvuploader @ https://github.com/BerkeleyLibrary/python-dvuploader/archive/refs/heads/include-tab-ingest-rebased.zip \ No newline at end of file +dvuploader >= 0.3.0 \ No newline at end of file