From 960080a868ff77c29d6de620392f40fe9ad531b7 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Fri, 20 Jan 2023 20:43:05 +0200 Subject: [PATCH 1/7] Updated for view --- slpkg/views/views.py | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/slpkg/views/views.py b/slpkg/views/views.py index 2153d24c..0348474f 100644 --- a/slpkg/views/views.py +++ b/slpkg/views/views.py @@ -39,26 +39,15 @@ class ViewMessage(Configs): def view_packages(self, package, version, mode): """ Printing the main packages. """ - is_installed = self.utils.is_installed(package) - inst_ver = self.utils.split_installed_pkg(is_installed)[1] + color = self.red - color = self.cyan - if mode == 'install' and is_installed: - color = self.grey - if mode == 'install' and self.flag_reinstall in self.flags and is_installed: - color = self.yellow - if mode == 'install' and self.utils.is_repo_version_bigger(package): - color = self.violet - if mode == 'remove': - color = self.red + if mode == 'install': + color = self.cyan if mode == 'build': color = self.yellow if mode == 'upgrade': color = self.violet - if inst_ver: - package = f'{package}-{inst_ver}' - self.ascii.draw_view_package(package, version, color) def view_skipping_packages(self, sbo, version): From ef39df068a5ea48c21e560c2be7624f5da14133a Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 21 Jan 2023 12:59:40 +0200 Subject: [PATCH 2/7] Fixed IndexError --- slpkg/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slpkg/main.py b/slpkg/main.py index 7a8e3e3b..9a64024f 100644 --- a/slpkg/main.py +++ b/slpkg/main.py @@ -491,7 +491,7 @@ def main(): try: argparse.check_for_flags(args[0]) arguments[args[0]]() - except KeyError: + except (KeyError, IndexError): Usage().help(1) From 5fe72c3a3ddd2a5596aa938c05587ef7c10a93fe Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 21 Jan 2023 13:44:51 +0200 Subject: [PATCH 3/7] Updated for view Signed-off-by: Dimitris Zlatanidis --- slpkg/views/views.py | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/slpkg/views/views.py b/slpkg/views/views.py index 0348474f..dbcd99a0 100644 --- a/slpkg/views/views.py +++ b/slpkg/views/views.py @@ -40,14 +40,34 @@ class ViewMessage(Configs): def view_packages(self, package, version, mode): """ Printing the main packages. """ color = self.red - - if mode == 'install': + + if mode in ['install', 'download']: color = self.cyan if mode == 'build': color = self.yellow if mode == 'upgrade': color = self.violet + # is_installed = self.utils.is_installed(package) + # inst_ver = self.utils.split_installed_pkg(is_installed)[1] + # + # color = self.cyan + # if mode == 'install' and is_installed: + # color = self.grey + # if mode == 'install' and self.flag_reinstall in self.flags and is_installed: + # color = self.yellow + # if mode == 'install' and self.utils.is_repo_version_bigger(package): + # color = self.violet + # if mode == 'remove': + # color = self.red + # if mode == 'build': + # color = self.yellow + # if mode == 'upgrade': + # color = self.violet + # + # if inst_ver: + # package = f'{package}-{inst_ver}' + self.ascii.draw_view_package(package, version, color) def view_skipping_packages(self, sbo, version): From 77b2241fbcf60f3be6f31def5844dcf9833163e4 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 21 Jan 2023 13:49:21 +0200 Subject: [PATCH 4/7] Updated for version Signed-off-by: Dimitris Zlatanidis --- man/slpkg-fr.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/slpkg-fr.1 b/man/slpkg-fr.1 index 08542c7c..df0def0c 100644 --- a/man/slpkg-fr.1 +++ b/man/slpkg-fr.1 @@ -1,4 +1,4 @@ -.TH slpkg 1 "Orestiada, Grèce" "slpkg 4.5.0" dslackw +.TH slpkg 1 "Orestiada, Grèce" "slpkg 4.5.1" dslackw .SH NOM .P .B slpkg - [OPTIONS] [COMMANDE] . From 059886ca92eb3975449b3b2cd3925c658a7ce596 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 21 Jan 2023 17:57:53 +0200 Subject: [PATCH 5/7] Updated for options --- man/slpkg.1 | 45 +++++++++++++++++++++++++-------------------- 1 file changed, 25 insertions(+), 20 deletions(-) diff --git a/man/slpkg.1 b/man/slpkg.1 index 3d640171..5f9e8a47 100644 --- a/man/slpkg.1 +++ b/man/slpkg.1 @@ -17,12 +17,12 @@ Slpkg works in accordance with the standards of the organization SlackBuilds.org Also uses the Slackware Linux instructions for installation, upgrading or removing packages. .SH COMMANDS .P -.B update --yes, --no-silent +.B update .RS Updates the package list and the database. .RE .P -.B upgrade --yes, --jobs, --resolve-off, --reinstall, --no-silent +.B upgrade .RS Upgrade all the installed packages if the newer version exists in the repository. .RE @@ -37,7 +37,7 @@ Check if there is any news on the SlackBuild's ChangeLog.txt file. Edit the configuration /etc/slpkg/slpkg.toml file. .RE .P -.B clean-logs --yes +.B clean-logs .RS Cleans dependencies log tracking. After that procedure you should remove dependencies by hand. .RE @@ -47,48 +47,48 @@ Cleans dependencies log tracking. After that procedure you should remove depende Deletes all the downloaded SlackBuilds scripts and sources. .RE .P -.B -b, build --yes, --jobs, --resolve-off, --search, --no-silent +.B -b, build .RS Builds the Slackbuilds scripts and adds them to the /tmp directory. .RE .P -.B -i, install --yes, --jobs, --resolve-off, --reinstall, --skip-installed, --search, --no-silent +.B -i, install .RS Builds and installs the packages in the correct order and also logs the packages with dependencies to use for removal. .RE .P -.B -d, download --yes, --search, --no-silent, --directory=PATH +.B -d, download .RS Download the SlackBuilds scripts and the sources without building or installing it. .RE .P -.B -r, remove --yes, resolve-off, --search, --no-silent +.B -r, remove .RS Removes packages with dependencies if the packages was installed with 'slpkg install' method. Slpkg looks at the 'sbo_repo_tag' configuration to find packages for removal. .RE .P -.B -f, find --search +.B -f, find .RS Find sbo installed packages on your distribution. .RE .P -.B -w, view --search, --pkg-version +.B -w, view .RS View packages from the repository and get everything in your terminal. .RE .P -.B -s, search --search +.B -s, search .RS Search and match packages from the repository. .RE .P -.B -e, dependees --full-reverse, --search, --pkg-version +.B -e, dependees .RS Show which SlackBuilds depend on. .RE .P -.B -t, tracking --search, --pkg-version +.B -t, tracking .RS Tracking the packages dependencies. .RE @@ -96,57 +96,62 @@ Tracking the packages dependencies. .P --yes .RS -Answer Yes to all questions. +Answer Yes to all questions. (to be used with: update, upgrade, clean-logs, -b, build, +-i, install, -d, download, -r, remove) .RE .P --jobs .RS Acceleration of SlackBuild scripts. When the --jobs flag is set, slpkg automatically detects the number of processors and enters it into the MAKEFLAGS variable. Some SlackBuilds fail when MAKEFLAGS is declared or -the number of processors (-j) is greater than one. +the number of processors (-j) is greater than one. (to be used with: upgrade, build, -i, install) .RE .P --resolve-off .RS -Turns off dependency resolving. +Turns off dependency resolving. (to be used with: upgrade, build, -i, install) .RE .P --reinstall .RS Use this option if you want to upgrade all packages even if the same version is already installed. -Do not skip installed packages. +Do not skip installed packages. (to be used with: upgrade, -i, install) .RE .P --skip-installed .RS This a helpful option if you want to avoid building and reinstalling packages. -Note: This option affects only the dependencies. +Note: This option affects only the dependencies. (to be used with: -i, install) .RE .P --full-reverse .RS Full reverse dependency. Works only with -e, dependees command and show the requires too. +(to be used with: -e, dependees) .RE .P --search .RS Enable the dialog utility to search packages from the repository. Example try: `slpkg install python3 --search` or `slpkg download python3 --search` and etc. +(to be used with: -b, build, -i, install, -d, download, -r, remove, -f, find, -w, view, +-s, search, -e, dependees, -t, tracking) .RE .P --no-silent .RS -Disable silent mode if it is enabled in the configuration file. +Disable silent mode if it is enabled in the configuration file. (to be used with: update, upgrade, -b, build, +-i, install, -d, download, -r, remove) .RE .P --directory=PATH .RS -The directory is the path where the files will be saved. +The directory is the path where the files will be saved. (to be used with: -d, download) .RE .P --pkg-version .RS -Print the repository package version. +Print the repository package version. (to be used with: -e, dependees, -t, tracking) .RE .P -h | --help From fbc947f90471d11e3573f663d0bd4aec067268b1 Mon Sep 17 00:00:00 2001 From: Dimitris Zlatanidis Date: Sat, 19 Jan 2019 11:44:33 +0100 Subject: [PATCH 6/7] Added checksum Signed-off-by: Dimitris Zlatanidis --- CHECKSUMS.md5 | 119 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 CHECKSUMS.md5 diff --git a/CHECKSUMS.md5 b/CHECKSUMS.md5 new file mode 100644 index 00000000..32433b7d --- /dev/null +++ b/CHECKSUMS.md5 @@ -0,0 +1,119 @@ +These are the MD5 message digests for the files in this directory. +If you want to test your files, use 'md5sum' and compare the values to +the ones listed here. + +To test all these files, use this command: + +tail +13 CHECKSUMS.md5 | md5sum -c --quiet - | less + +'md5sum' can be found in the GNU coreutils package on ftp.gnu.org in +/pub/gnu, or at any GNU mirror site. + +MD5 message digest Filename +74d79364aef2717c00eae3a37c0e7479 ./slpkg-2.1.5.tar.gz +b37d59524be1ce9ef1c4e13e91ceb763 ./slpkg-2.2.0.tar.gz +3b869056c2309ee3f694b2c11f5533bd ./slpkg-2.2.1.tar.gz +c32bc46bcb2f5a7b4fbc681a6cccc3de ./slpkg-2.2.2.tar.gz +3c7259a18644573e116b4836095aebd8 ./slpkg-2.2.3.tar.gz +246571f3f6489dd98a67df3a2d1acb58 ./slpkg-2.2.5.tar.gz +bc70626560b37398bd66a02cc3c9f5ef ./slpkg-2.2.6.tar.gz +abea645bd382aa47500588631c299bb1 ./slpkg-2.2.7.tar.gz +5aa9870ad189864cfed45a910f5136b9 ./slpkg-2.2.8.tar.gz +cd3c213b4c0da976be970e9fe888e5e3 ./slpkg-2.2.9.tar.gz +08a345549a0a3e1de2103c3b4085b880 ./slpkg-2.3.0.tar.gz +ac61b4952462327f7f06f1d5ea11920d ./slpkg-2.3.1.tar.gz +70175c577672fd0f488cb9f5a715a2c3 ./slpkg-2.3.2.tar.gz +1f7b391e2e3e4f414f58660b094775d8 ./slpkg-2.3.3.tar.gz +141433a4e78e96b4efb0a2e32d75c1be ./slpkg-2.3.4.tar.gz +93b7a0d94695526e1821e3b04685b58f ./slpkg-2.3.5.tar.gz +d0bef671bb8a3f8def08e289f7a84b65 ./slpkg-2.3.6.tar.gz +03f8b36727bf10b46d78c581266670db ./slpkg-2.4.0.tar.gz +9f422c008b25820eb55202989f2871da ./slpkg-2.4.1.tar.gz +ae5ca3128a6ad05b3061541b088f3a1f ./slpkg-2.4.2.tar.gz +8b48e7080bd5363e8752666b9bf583e9 ./slpkg-2.4.3.tar.gz +41552b535b00cd03488d87060e561e05 ./slpkg-2.4.4.tar.gz +4df3325bbf2f67629a41ce498e55f2a6 ./slpkg-2.5.0.tar.gz +e4c638055b82a4590695e5c6b269aa53 ./slpkg-2.5.1.tar.gz +60e6bc9cfa456637112a942a461e6619 ./slpkg-2.5.2.tar.gz +0375ac84e760f51f1d575d96f3ba7fbf ./slpkg-2.5.3.tar.gz +205589985bf31249e6f1ab5c68c18e44 ./slpkg-2.5.4.tar.gz +dff6a5c677311f9c4d17e45088ef2f58 ./slpkg-2.5.5.tar.gz +7936eabe05be9acee42df45f75bc8107 ./slpkg-2.5.6.tar.gz +fd031880db1f60aa90eef0e0fc9a106b ./slpkg-2.5.7.tar.gz +9f8f748ab7ab99799a9e55891b11130c ./slpkg-2.5.8.tar.gz +cbc5213680f8db5c1283923ff07b066f ./slpkg-2.5.9.tar.gz +f6cb268e56051a958538c4182870f241 ./slpkg-2.6.0.tar.gz +8c7fde89ba7658d3505c88d5b7dd1b40 ./slpkg-2.6.1.tar.gz +1f0cca089df4d157201730f27afa4765 ./slpkg-2.6.2.tar.gz +95ccc27545a259087e0dd0b666cbb686 ./slpkg-2.6.3.tar.gz +8584d7d9d3666a93f6d14f5e42e4cb41 ./slpkg-2.6.4.tar.gz +2240d34cc28c69846ad47bea473f25e4 ./slpkg-2.6.5.tar.gz +e6ed625b553fd2f24f149162e4fa735f ./slpkg-2.6.6.tar.gz +48a3941cd990a1a037f11d989d2e5be0 ./slpkg-2.6.7.tar.gz +4f2df9ad3ffc303373e26200544d4af4 ./slpkg-2.6.8.tar.gz +f348ca49b0d8419f170f2211399a0851 ./slpkg-2.6.9.tar.gz +a41dbb2b95c34bd31319addcae0f1e49 ./slpkg-2.7.0.tar.gz +28ec4b26e87188f1ebf1eb0a8fcb64e2 ./slpkg-2.7.1.tar.gz +4a110faf3df50c336678b410736295e3 ./slpkg-2.7.2.tar.gz +18cb0f66a8a5fb27e9170efd59a7e1df ./slpkg-2.7.3.tar.gz +86579033c8789b5896a36b377508d367 ./slpkg-2.7.4.tar.gz +12dd03c8ed172eebc41f9ed84993780b ./slpkg-2.7.5.tar.gz +4484ede82d667badb6dd22873d2da785 ./slpkg-2.7.6.tar.gz +3bb2cb5f2427fa9024af8df9e6a6d51d ./slpkg-2.8.0.tar.gz +7545f9dbce24deb9b4b69d7303c00f28 ./slpkg-2.8.1.tar.gz +8158ab7fe2555a24553c9efa6d6f8ac9 ./slpkg-2.8.2.tar.gz +d6842f77b159a9f9db8183c10abcb83f ./slpkg-2.8.3.tar.gz +5247eb52e9864a1dd4d134893227a7a4 ./slpkg-2.8.4.tar.gz +64a22e9fbf7a6bc04b6f544609322434 ./slpkg-2.8.5.tar.gz +5e4ccdb74fe3abde188994a362de1d67 ./slpkg-2.8.6.tar.gz +cac1f51618665cebd8ed778f78a8d2fe ./slpkg-2.8.7.tar.gz +f65b1525da801a7cc2e460cf1eb5d4be ./slpkg-2.8.8.tar.gz +1a311e132d3b7957f3ab3d128072a10f ./slpkg-2.8.9.tar.gz +737b6a59dcb103708c4aeab4a96b517d ./slpkg-2.9.0.tar.gz +2ba8c1f63d05f368d9c7a6f12f4df387 ./slpkg-2.9.1.tar.gz +8970a287eafc773bc87905204fea35f6 ./slpkg-2.9.2.tar.gz +8d749508937faf31ee2432a05f64a46e ./slpkg-2.9.3.tar.gz +6616d6612e6eed897fd723777f5fb273 ./slpkg-2.9.4.tar.gz +f645936c1b143e4e1fa7c1637a4ea03f ./slpkg-2.9.5.tar.gz +d30ee37dbab0b113e6493fc61ee2f0b2 ./slpkg-2.9.6.tar.gz +a3a9e3768fc1ba3da91503b49325fee3 ./slpkg-2.9.7.tar.gz +96b1e1262a410e385f21e5413329ce18 ./slpkg-3.0.0.tar.gz +fab52c1b84e988cd5ec4b5ddbc95277c ./slpkg-3.0.1.tar.gz +4dd94caee2ef25501a5b70546ee0e3a4 ./slpkg-3.0.2.tar.gz +b88c991b2d29934f9f69104144a97e26 ./slpkg-3.0.3.tar.gz +1d50725d7bd271533442ca61bdf989fd ./slpkg-3.0.4.tar.gz +36a0b209ec8f194b86870112a3baa5b2 ./slpkg-3.0.5.tar.gz +101233e422a193f16d9056cf9f9d7b75 ./slpkg-3.0.6.tar.gz +9ec6024d77cd0e42292358ab1520973e ./slpkg-3.0.7.tar.gz +3e20b6d9ac4f36719ea76555910f6fe3 ./slpkg-3.0.8.tar.gz +44865cf611fc9a8d6425ce40f65d24f3 ./slpkg-3.0.9.tar.gz +fb2c0fedd2af291195faccfd304087be ./slpkg-3.1.0.tar.gz +e2b106a786a889c26385bf6ef266f09b ./slpkg-3.1.1.tar.gz +d9652f8d1ed42cb35084fdea88a8e483 ./slpkg-3.1.2.tar.gz +bb1ecf5cee734126f28241e810b77db3 ./slpkg-3.1.3.tar.gz +7b575cb93f3d2203fa2d3c41bd20f922 ./slpkg-3.1.4.tar.gz +f31a256221c02efbe4d356829d2a85e4 ./slpkg-3.1.5.tar.gz +9fbe32bd1f22e1784e2bb1ae7a288a4f ./slpkg-3.1.6.tar.gz +c3704b344c426151786a9760c4c62c4a ./slpkg-3.1.7.tar.gz +85df62558734a4113827e3b7f461c56e ./slpkg-3.1.8.tar.gz +9dc7d81d758a98ce3ad9c94364f33850 ./slpkg-3.1.9.tar.gz +1a006b491e0d3cb5613f37bdf1847c6c ./slpkg-3.2.0.tar.gz +88812d9fe483f30635f35ec8d19b74d1 ./slpkg-3.2.1.tar.gz +137a121ff3dc9f37abd3af6e2a6ae6c4 ./slpkg-3.2.2.tar.gz +33dddeeea7eb50420455a82bd32bce7c ./slpkg-3.2.3.tar.gz +57ba5c20050411095f2ae732e5012576 ./slpkg-3.2.4.tar.gz +ce4657f7e644ad58adb21eddfcea495a ./slpkg-3.2.5.tar.gz +95b595479e7fb6e0ed934f33a74c267c ./slpkg-3.2.6.tar.gz +a937c14f0d728ba36c1afd91a6800282 ./slpkg-3.2.7.tar.gz +9f10d66105681d304edb130d7948d92f ./slpkg-3.2.8.tar.gz +bd1ac24393c5cfdc8c7546fe9e9d0ff2 ./slpkg-3.2.9.tar.gz +d9b3a3a2903f2e3637b6f7d324f979b3 ./slpkg-3.3.0.tar.gz +65acf0561ba00fce3a012c0b76383292 ./slpkg-3.3.1.tar.gz +7eb3f0cd2d78fcd073420a5152ec14cd ./slpkg-3.3.2.tar.gz +da0c65f15f8c8b53edd964a703560e79 ./slpkg-3.3.3.tar.gz +0c08eaac7f40fd9d8304aed8c3e69050 ./slpkg-3.3.4.tar.gz +01c779d3f22439c2a8903015bc4d14b1 ./slpkg-3.3.5.tar.gz +e2e5c91996d68c248416c90127347233 ./slpkg-3.3.6.tar.gz +3fe4ca75b734a7880cf13a07d6e1b441 ./slpkg-3.3.7.tar.gz +86024e707ff696ebecf8de77da14500e ./slpkg-3.3.8.tar.gz +049284f54ea21e8443226dbb92f61095 ./slpkg-3.3.9.tar.gz From 57233be85d1ed97f2b932ef85c23df05922ca581 Mon Sep 17 00:00:00 2001 From: maravtdm Date: Sat, 21 Jan 2023 17:08:48 +0100 Subject: [PATCH 7/7] change --directory --- man/slpkg-fr.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/man/slpkg-fr.1 b/man/slpkg-fr.1 index df0def0c..43d7277a 100644 --- a/man/slpkg-fr.1 +++ b/man/slpkg-fr.1 @@ -141,7 +141,7 @@ Désactive le mode silencieux s'il est activé dans le fichier de configuration. .P --directory=PATH .RS -Le répertoire est le chemin où les fichiers seront enregistrés. +Définit le répertoire où seront enregistrés les fichiers téléchargés. .RE .P --pkg-version