diff --git a/create_mygit_default_conf/main.py b/create_mygit_default_conf/main.py index 22179e9..c4ef6b3 100755 --- a/create_mygit_default_conf/main.py +++ b/create_mygit_default_conf/main.py @@ -12,8 +12,7 @@ list_my_git_projects = [ "https://gitlab.com", "https:ubuntu:5000" ] -my_username = "jonnybravo" - +my_username = os.environ["USER"] if not os.path.exists(user_gitconfig): os.popen("touch " + user_gitconfig) diff --git a/jenkins/search_string_inFile.py b/jenkins/search_string_inFile.py index 9ae2b04..3121e26 100644 --- a/jenkins/search_string_inFile.py +++ b/jenkins/search_string_inFile.py @@ -1,33 +1,18 @@ #! /usr/bin/env python3 -import os - -def read_all_sub_Folder(target_folder = str, search_string = str): - key_liste = [] - for root, dirs, files in os.walk(target_folder, topdown=False, ): - for name in files: - if name == search_string: - FullPATH = str(os.path.join(root, name)) - #if FullPATH.endswith(".pub") is False :#and FullPATH.endswith("known_hosts") is False and FullPATH.endswith("authorized_keys") is False: - #if FullPATH. - key_liste.append({"FullPath": FullPATH, - "Name": name, - "Root": root, - "Folder": dirs}) - return key_liste +import my_search if __name__ == "__main__": search_jenkins_folder = "/home/jonnybravo/.jenkins/data/jobs" search_string = """./test_play.yml""" - for i in read_all_sub_Folder(target_folder=search_jenkins_folder, search_string="config.xml"): + for i_full in my_search.read_all_sub_Folder(target_folder=search_jenkins_folder, search_string="config.xml"): #print(i["FullPath"]) - with open(i["FullPath"], 'r') as file: + with open(i_full["FullPath"], 'r') as file: data = file.read() index = data.find(search_string) - print(index) if not index == -1: - print("Ist in file vorhanden", file, sep=" ") + print("Ist in file vorhanden", file.name, sep=" ") #data = data.replace('-1', '') - #with open(i["FullPath"], 'w') as file: + #with open(i["FullPath"], 'w') as file: # file.write(data) diff --git a/play_with_sqllite/startegie.db b/play_with_sqllite/startegie.db index 957e85a..267f006 100644 Binary files a/play_with_sqllite/startegie.db and b/play_with_sqllite/startegie.db differ