diff --git a/automation_tasks_rs/src/main.rs b/automation_tasks_rs/src/main.rs index f843bfc..ec4a733 100644 --- a/automation_tasks_rs/src/main.rs +++ b/automation_tasks_rs/src/main.rs @@ -179,7 +179,7 @@ fn task_doc() { cl::run_shell_command("rsync -a --info=progress2 --delete-after target/doc/ docs/"); // Create simple index.html file in docs directory cl::run_shell_command(&format!( - r#"echo "" > docs/index.html"#, + r#"printf "" > docs/index.html\n"#, cargo_toml.package_name().replace("-", "_") )); // pretty html diff --git a/docs/src/github_readme_copy/github_mod.rs.html b/docs/src/github_readme_copy/github_mod.rs.html index db4b20c..79c4bae 100644 --- a/docs/src/github_readme_copy/github_mod.rs.html +++ b/docs/src/github_readme_copy/github_mod.rs.html @@ -960,7 +960,7 @@ :: num of repositories: {num_of_repo} -ECHO OFF +printf OFF "# )); @@ -970,7 +970,7 @@ :: num of repositories: {num_of_repo} -ECHO OFF +printf OFF "# )); @@ -979,14 +979,14 @@ let repo_name = &repo.name; pull_script.push_str(&format!( r#"cd {path_base}\{repo_name}\ -echo %cd% +printf %cd% git pull "# )); push_script.push_str(&format!( r#"cd {path_base}\{repo_name}\ -echo %cd% +printf %cd% git commit -a -m "2022-07-17" git push "# diff --git a/src/github_mod.rs b/src/github_mod.rs index 84b31b8..616dc0b 100644 --- a/src/github_mod.rs +++ b/src/github_mod.rs @@ -425,21 +425,16 @@ pub fn github_backup_bash_scripts(token: &str) { let path_base = r#"c:\Users\Luciano\Dropbox\BestiaDev\github_backup"#; let mut pull_script = String::from(&format!( r#":: pull_all.cmd -:: script to pull all the changes from GitHub into local folder github_backup - -:: num of repositories: {num_of_repo} - -ECHO OFF +# pull_all_for_backup.sh +# run inside git-bash in windows in the folder /d\Dropbox\BestiaDev\github_backup_automation_tasks_rs\ +# sh pull_all_for_backup.sh "# )); let mut push_script = String::from(&format!( - r#":: pull_all.cmd -:: script to push all the changes from local folder github_backup to github - -:: num of repositories: {num_of_repo} - -ECHO OFF + r#"# push_all_for_backup.sh +# run inside git-bash in windows in the folder /d\Dropbox\BestiaDev\github_backup_automation_tasks_rs\ +# sh push_all_for_backup.sh "# )); @@ -448,16 +443,18 @@ ECHO OFF let repo_name = &repo.name; pull_script.push_str(&format!( r#"cd {path_base}\{repo_name}\ -echo %cd% - git pull + pwd + git fetch --all + git merge "# )); push_script.push_str(&format!( r#"cd {path_base}\{repo_name}\ -echo %cd% - git commit -a -m "2022-07-17" - git push + pwd + git add . + git commit -a -m "2024-03-25" + git push "# )); }