Miroirs/slpkg
1
0
Fork 0
mirror of https://gitlab.com/dslackw/slpkg.git synced 2024-11-16 07:47:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated for diff command

Browse source
This commit is contained in:
Dimitris Zlatanidis 2024-03-31 22:49:28 +03:00
parent 20f9e0e955
commit 53399ce4f7
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog.txt
View file

@ -1,5 +1,9 @@
## slpkg - ChangeLog ## slpkg - ChangeLog
### 5.0.3 - 31/03/2024
- Updated:
* Updated for slpkg_new-configs and (D)iff command (Thanks to Marav)
### 5.0.2 - 30/03/2024 ### 5.0.2 - 30/03/2024
- Updated: - Updated:
* Updated for coding style * Updated for coding style

7
slpkg/new_configs.py
View file

@ -45,10 +45,10 @@ class NewConfigs:
def check(self) -> None: def check(self) -> None:
""" Checks for .new files. """ """ Checks for .new files. """
print('\nChecking for NEW configuration files...') print('Checking for NEW configuration files...\n')
if (self.slpkg_config_new.is_file() or self.blacklist_config_new.is_file() if (self.slpkg_config_new.is_file() or self.blacklist_config_new.is_file()
or self.repositories_config_new.is_file()): or self.repositories_config_new.is_file()):
print('\nThere are NEW files:\n') print('There are NEW files:\n')
if self.slpkg_config_new.is_file(): if self.slpkg_config_new.is_file():
print(f"{self.bgreen:>12}{self.slpkg_config_new}{self.endc}") print(f"{self.bgreen:>12}{self.slpkg_config_new}{self.endc}")
@ -193,6 +193,7 @@ class NewConfigs:
print() # new line print() # new line
if make.lower() == 'd': if make.lower() == 'd':
self.diff_files(self.slpkg_config_new, self.slpkg_config) self.diff_files(self.slpkg_config_new, self.slpkg_config)
self.prompt_slpkg_config()
if make.lower() == 'v': if make.lower() == 'v':
self.vimdiff(self.slpkg_config_new, self.slpkg_config) self.vimdiff(self.slpkg_config_new, self.slpkg_config)
@ -213,6 +214,7 @@ class NewConfigs:
print() # new line print() # new line
if make.lower() == 'd': if make.lower() == 'd':
self.diff_files(self.repositories_config_new, self.repositories_config) self.diff_files(self.repositories_config_new, self.repositories_config)
self.prompt_repositories_config()
if make.lower() == 'v': if make.lower() == 'v':
self.vimdiff(self.repositories_config_new, self.repositories_config) self.vimdiff(self.repositories_config_new, self.repositories_config)
@ -233,6 +235,7 @@ class NewConfigs:
print() # new line print() # new line
if make.lower() == 'd': if make.lower() == 'd':
self.diff_files(self.blacklist_config_new, self.blacklist_config) self.diff_files(self.blacklist_config_new, self.blacklist_config)
self.prompt_blacklist_config()
if make.lower() == 'v': if make.lower() == 'v':
self.vimdiff(self.blacklist_config_new, self.blacklist_config) self.vimdiff(self.blacklist_config_new, self.blacklist_config)