diff --git a/scripts/pgit.sh b/scripts/pgit.sh index 417f917c..efa14ecd 100644 --- a/scripts/pgit.sh +++ b/scripts/pgit.sh @@ -184,7 +184,7 @@ cmd_get() [ "$from_user" ] || from_user=$whoami if [ -z "$projects" ]; then - projects=`$jw_projects projects list-repos --from-user $from_user $remote_base` + projects=`$jw_projects projects list-repos --from-owner $from_user $remote_base` [ "$?" != 0 ] && exit 1 fi diff --git a/src/python/jw/pkg/cmds/projects/CmdListRepos.py b/src/python/jw/pkg/cmds/projects/CmdListRepos.py index 0a13c880..8755007c 100644 --- a/src/python/jw/pkg/cmds/projects/CmdListRepos.py +++ b/src/python/jw/pkg/cmds/projects/CmdListRepos.py @@ -18,7 +18,7 @@ class CmdListRepos(Cmd): # export parser.add_argument('base_url', help='Base URL of all Git repositories without user part') parser.add_argument('--username', help='Username for SSH or HTTP authentication, don\'t specify for unauthenticated', default=None) parser.add_argument('--askpass', help='Program to echo password for SSH or HTTP authentication, don\'t specify for unauthenticated', default=None) - parser.add_argument('--from-user', help='List from-user\'s projects', default='janware') + parser.add_argument('--from-owner', help='List from-owner\'s projects', default='janware') async def _run(self, args: Namespace) -> None: @@ -38,7 +38,7 @@ class CmdListRepos(Cmd): # export ssh.set_username(username) if password is not None: ssh.set_password(password) - cmd = f'/opt/jw-pkg/bin/git-srv-admin.sh -u {args.from_user} -j list-personal-projects' + cmd = f'/opt/jw-pkg/bin/git-srv-admin.sh -u {args.from_owner} -j list-personal-projects' out = await ssh.run_cmd(cmd) print(out) return @@ -54,7 +54,7 @@ class CmdListRepos(Cmd): # export assert username is not None cmd_input = (f'-u {username}:{password}').encode('utf-8') curl_args.extend(['-K-']) - curl_args.append(f'https://api.github.com/users/{args.from_user}/repos') + curl_args.append(f'https://api.github.com/users/{args.from_owner}/repos') repos = await run_curl(curl_args, cmd_input=cmd_input) for repo in repos: print(repo['name']) @@ -68,7 +68,7 @@ class CmdListRepos(Cmd): # export cmd_input = (f'-u {username}:{password}').encode('utf-8') curl_args.extend(['-K-']) for entities_dir in ['orgs', 'users']: - api_url = f'{args.base_url}/api/v1/{entities_dir}/{args.from_user}/repos' + api_url = f'{args.base_url}/api/v1/{entities_dir}/{args.from_owner}/repos' try: tried.append(api_url) repos = await run_curl(curl_args + [api_url], cmd_input=cmd_input) @@ -81,7 +81,7 @@ class CmdListRepos(Cmd): # export raise RuntimeError(f'Failed to fetch repository list from assumed Forgejo instance at {args.base_url}, tried {', '.join(tried)}') return if os.path.isdir(args.base_url): - for subdir in ["." , args.from_user]: + for subdir in ["." , args.from_owner]: out = [] for entry in os.scandir(args.base_url + "/" + subdir): path = entry.path