vvzvlad/vestasync
1
0
Fork 0
mirror of https://github.com/vvzvlad/vestasync.git synced 2024-12-27 12:41:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: vvzvlad:99d83216bad17ef36384d0a99b2879a2a31d3600
Branches Tags
vvzvlad:master
...
compare: vvzvlad:e898e4e21e0fe0f29811416c29ff91bba7813172
Branches Tags
vvzvlad:master

2 Commits
99d83216ba ... e898e4e21e

Author SHA1 Message Date
vvzvlad
e898e4e21e С->C 2023-10-12 12:59:23 +03:00
vvzvlad
53fcb38777 fix bug 2023-10-12 12:58:18 +03:00
1 changed files with 5 additions and 6 deletions
Show Stats Expand all files Collapse all files

11
vestasync.py
View File

@ -200,10 +200,11 @@ def mark_original_restored(c, mark):
def reboot(c): def reboot(c):
c.run("reboot > /dev/null 2>&1", warn=True) c.run("reboot > /dev/null 2>&1", warn=True)
def git_add_remote(c): def git_remove_remote(c):
hostname = c.run('hostname', hide=True).stdout.strip() hostname = c.run('hostname', hide=True).stdout.strip()
c.run(f'cd /mnt/data/etc/ && git remote | xargs -L1 git remote remove', warn=True, hide=True) c.run(f'cd /mnt/data/etc/ && git remote | xargs -L1 git remote remove', warn=True, hide=True)
def git_clone(c): def git_clone(c):
c.run(f'rm -rf /mnt/data/{args.source_hostname}_etc ', warn=True) c.run(f'rm -rf /mnt/data/{args.source_hostname}_etc ', warn=True)
c.run(f'mkdir -p /mnt/data/{args.source_hostname}_etc ', hide=True) c.run(f'mkdir -p /mnt/data/{args.source_hostname}_etc ', hide=True)
@ -229,7 +230,7 @@ def copy_etc(c):
c.run(f"mkdir -p {dest_item}") c.run(f"mkdir -p {dest_item}")
print(f"Restore: {item} -> {dest_item}") print(f"Restore: {item} -> {dest_item}")
print(f"[VestaSync] Сopy source .git...") print(f"[VestaSync] Copy source .git...")
c.run(f"cp -R /mnt/data/{args.source_hostname}_etc/.git /mnt/data/etc/.git") c.run(f"cp -R /mnt/data/{args.source_hostname}_etc/.git /mnt/data/etc/.git")
print(f"[VestaSync] Remove source etc...") print(f"[VestaSync] Remove source etc...")
@ -304,12 +305,11 @@ def device_install(c):
print("[VestaSync] Run users cmd's...") print("[VestaSync] Run users cmd's...")
run_user_cmd(c, args.user_cmd) run_user_cmd(c, args.user_cmd)
print("[VestaSync] Initializing local repo...") print("[VestaSync] Initializing local repo and add remote...")
init_repo(c) init_repo(c)
print("[VestaSync] Creating repo on gitea and add remote...") print("[VestaSync] Creating repo on gitea...")
create_repo(c) create_repo(c)
git_add_remote(c)
print("[VestaSync] Pushing raw cfg's...") print("[VestaSync] Pushing raw cfg's...")
ppush_the_repo(c) ppush_the_repo(c)
@ -365,7 +365,6 @@ def device_restore():
restore_hostname(c) restore_hostname(c)
if args.reinstall_packages is not None: if args.reinstall_packages is not None:
install_packages(c) install_packages(c)
git_add_remote(c)
#ppush_the_repo(c) #TODO: не работает! #ppush_the_repo(c) #TODO: не работает!
create_autogit_systemd(c) create_autogit_systemd(c)
create_automac_systemd(c) create_automac_systemd(c)