From b53f8227c0ec490d10f8917abf6118b38dc6f4cf Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 4 Mar 2023 22:08:34 +0200 Subject: [PATCH] Updated for ponce --- configs/slpkg.toml | 9 +++------ slpkg/update_repository.py | 8 ++++---- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/configs/slpkg.toml b/configs/slpkg.toml index eacd9857..3991a7ad 100644 --- a/configs/slpkg.toml +++ b/configs/slpkg.toml @@ -32,7 +32,8 @@ SBO_REPO_TAG = "_SBo" # PONCE REPOSITORY CONFIGS. - # Set the 'PONCE_REPO = true' to switch with the ponce repository. + # Set the 'PONCE_REPO = true' to switch with the ponce repository and + # run 'slpkg update' to update the database. # Default is false. [true/false]. PONCE_REPO = false PONCE_REPO_PATH = "/var/lib/slpkg/repository/ponce/" @@ -49,7 +50,6 @@ REMOVEPKG = "removepkg" # You can choose downloader between wget and curl. - # Ponce repository works only with 'lftp' downloader. # Default is wget. [wget/curl]. DOWNLOADER = "wget" # Wget downloader options. @@ -59,9 +59,6 @@ # --show-progress, Force wget to display the progress bar in any verbosity. WGET_OPTIONS = "-c -N -q --show-progress" # Curl downloader options. - # Pass the options you want here. CURL_OPTIONS = "" - # Lftp downloader options. - # 'LFTP_MIRROR_OPTIONS' are used only for the ponce repository to transfer files - # from the ponce repository. + # Lftp downloader options are used to synchronize with the ponce repository. LFTP_MIRROR_OPTIONS = "-c mirror --parallel=100 --only-newer" diff --git a/slpkg/update_repository.py b/slpkg/update_repository.py index edb3d978..fb255f24 100644 --- a/slpkg/update_repository.py +++ b/slpkg/update_repository.py @@ -44,15 +44,15 @@ class UpdateRepository(Configs): subprocess.call(f'lftp {self.lftp_mirror_options} {self.ponce_repo_url} {self.ponce_repo_path}', shell=True) - print(f'Generating the {self.sbo_txt} file... ', end='', flush=True) + print(f'Generating the {self.ponce_txt} file... ', end='', flush=True) print('\n') # Generating the SLACKBUILDS.TXT file. os.chdir(self.ponce_repo_path) - subprocess.call(f'./gen_sbo_txt.sh > {self.sbo_txt}', shell=True) + subprocess.call(f'./gen_sbo_txt.sh > {self.ponce_txt}', shell=True) - # Move the SLACKBUILDS.TXT to the repository for install the data into the database. - shutil.move(f'{self.ponce_repo_path}{self.sbo_txt}', f'{self.sbo_repo_path}{self.sbo_txt}') + # Move the SLACKBUILDS.TXT to the repository to install the data into the database. + shutil.move(f'{self.ponce_repo_path}{self.ponce_txt}', f'{self.sbo_repo_path}{self.ponce_txt}') self.delete_sbo_data()