From 6643fefdf74df4e63e322358974fe843960dcc55 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sun, 16 Oct 2016 13:50:51 +0100 Subject: [PATCH 01/16] ncmpcpp: Set ncmpcpp_directory --- ncmpcpp/config | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ncmpcpp/config b/ncmpcpp/config index aeea0b6..5c3f460 100644 --- a/ncmpcpp/config +++ b/ncmpcpp/config @@ -6,7 +6,9 @@ mpd_host = "localhost" mpd_port = "6600" mpd_music_dir = "~/music" -lyrics_directory = "~/.local/share/mpd/lyrics" + +ncmpcpp_directory = "~/.config/ncmpcpp" +lyrics_directory = "~/.local/share/mpd/lyrics" playlist_display_mode = "columns" browser_display_mode = "columns" -- 2.49.0 From abd7add3283174112dd5eb0cb4087015f493b95a Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sun, 16 Oct 2016 13:52:36 +0100 Subject: [PATCH 02/16] Makefile: add separate targets for mpd and ncmpcpp --- Makefile | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 44aacdc..e4f5e15 100644 --- a/Makefile +++ b/Makefile @@ -1,12 +1,22 @@ APATH := $(realpath .) FILES := bin -DOTFILES := conky* goobookrc msmtp* mutt ncmpcpp profile tmux.conf weechat Xresources xprofile zprofile zshenv zshrc -CONFIGFILES := aliases compton.conf git gnupg mpd mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh +DOTFILES := conky* goobookrc msmtp* mutt profile tmux.conf weechat Xresources xprofile zprofile zshenv zshrc +CONFIGFILES := aliases compton.conf git gnupg mpv offlineimap ranger retroarch systemd vim xbindkeys xkb zsh .PHONY: install $(FILES) $(DOTFILES) $(CONFIGFILES) install: $(FILES) $(DOTFILES) $(CONFIGFILES) +mpd: + ln -sfT $(APATH)/mpd ~/.config/mpd + mkdir -p ~/.local/share/mpd/playlists +.PHONY: mpd + +ncmpcpp: + ln -sfT $(APATH)/ncmpcpp ~/.config/ncmpcpp + mkdir -p ~/.local/share/mpd/lyrics +.PHONY: ncmpcpp + $(FILES): @if [[ -e ~/$@ && ! -L ~/$@ ]]; then \ if [[ -d $@ ]]; then \ -- 2.49.0 From 5d36725ea7b79728da527f4dd91e98759dbcb46e Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Sun, 16 Oct 2016 14:12:17 +0100 Subject: [PATCH 03/16] ncmpcpp: ctrl_ will be deprecated --- ncmpcpp/bindings | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ncmpcpp/bindings b/ncmpcpp/bindings index 83ae3d5..1db505b 100644 --- a/ncmpcpp/bindings +++ b/ncmpcpp/bindings @@ -2,7 +2,7 @@ def_key "q" dummy -def_key "ctrl_c" +def_key "ctrl-c" quit def_key "k" -- 2.49.0 From ab7fac60a606ec7050b1159a4bb48b4c37d1f8f7 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 18 Oct 2016 13:49:50 +0100 Subject: [PATCH 04/16] vim: reformat ycm_extra_conf --- vim/ycm_extra_conf.py | 133 +++++++++++++++++++++--------------------- 1 file changed, 65 insertions(+), 68 deletions(-) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index ac15c22..ab42d27 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -1,83 +1,80 @@ import os -import shlex -import subprocess -import ycm_core -def FlagsForFile( filename, **kwargs ): - client_data = kwargs['client_data'] - cwd = client_data['getcwd()'] - # These are the compilation flags that will be used in case there's no - # compilation database set (by default, one is not set). - flags = [ - '-Wall', - # '-Wextra', - # '-Wshadow', - # '-Werror', - # '-Wc++98-compat', - # '-Wno-long-long', - # '-Wno-variadic-macros', - # '-fexceptions', - # '-DNDEBUG', - '-std=c++11', - '-stdlib=libstdc++', - '-x', 'c++', - '-I', '.', - '-I', './include', - ] - flags += rospack() - relative_to = cwd - final_flags = MakeRelativePathsInFlagsAbsolute( flags, relative_to ) - return { - 'flags': final_flags, - 'do_cache': True - } +def FlagsForFile(filename, **kwargs): + client_data = kwargs['client_data'] + cwd = client_data['getcwd()'] + + flags = [ + '-Wall', + # '-Wextra', + # '-Wshadow', + # '-Werror', + # '-Wc++98-compat', + # '-Wno-long-long', + # '-Wno-variadic-macros', + # '-fexceptions', + # '-DNDEBUG', + '-std=c++11', + '-stdlib=libstdc++', + '-x', 'c++', + '-I', '.', + '-I', './include', + ] + flags += rospack() + relative_to = cwd + final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) + + return { + 'flags': final_flags, + 'do_cache': True + } # This function makes it easy to pull in additional flags from rospack def rospack(): - cmd = ['rospack', 'cflags-only-I'] - try: - out = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE).stdout - except: - return [] - line = out.readline()[:-1].split(" ") - includes = [] - for include in line: - if include.startswith(os.path.expanduser('~')): - includes += ['-I', include] - else: - includes += ['-isystem', include] - return filter(lambda a: a != ' ', includes) + cmd = ['rospack', 'cflags-only-I'] + try: + out = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE).stdout + except: + return [] + line = out.readline()[:-1].split(" ") + includes = [] + for include in line: + if include.startswith(os.path.expanduser('~')): + includes += ['-I', include] + else: + includes += ['-isystem', include] + return filter(lambda a: a != ' ', includes) def DirectoryOfThisScript(): - return os.path.dirname( os.path.abspath( __file__ ) ) + return os.path.dirname(os.path.abspath(__file__)) -def MakeRelativePathsInFlagsAbsolute( flags, working_directory ): - if not working_directory: - return list( flags ) - new_flags = [] - make_next_absolute = False - path_flags = [ '-isystem', '-I', '-iquote', '--sysroot=' ] - for flag in flags: - new_flag = flag - if make_next_absolute: - make_next_absolute = False - if not flag.startswith( '/' ): - new_flag = os.path.join( working_directory, flag ) +def MakeRelativePathsInFlagsAbsolute(flags, working_directory): + if not working_directory: + return list(flags) + new_flags = [] + make_next_absolute = False + path_flags = ['-isystem', '-I', '-iquote', '--sysroot='] + for flag in flags: + new_flag = flag - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break + if make_next_absolute: + make_next_absolute = False + if not flag.startswith('/'): + new_flag = os.path.join(working_directory, flag) - if flag.startswith( path_flag ): - path = flag[ len( path_flag ): ] - new_flag = path_flag + os.path.join( working_directory, path ) - break + for path_flag in path_flags: + if flag == path_flag: + make_next_absolute = True + break - if new_flag: - new_flags.append( new_flag ) - return new_flags + if flag.startswith(path_flag): + path = flag[len(path_flag):] + new_flag = path_flag + os.path.join(working_directory, path) + break + if new_flag: + new_flags.append(new_flag) + return new_flags -- 2.49.0 From 1ce562c61664d2e28a69b869a320513e87fbea76 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 18 Oct 2016 13:51:05 +0100 Subject: [PATCH 05/16] vim: remove rospack from ycm_extra_conf --- vim/ycm_extra_conf.py | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index ab42d27..0e3b5da 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -21,7 +21,6 @@ def FlagsForFile(filename, **kwargs): '-I', '.', '-I', './include', ] - flags += rospack() relative_to = cwd final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) @@ -30,22 +29,6 @@ def FlagsForFile(filename, **kwargs): 'do_cache': True } -# This function makes it easy to pull in additional flags from rospack -def rospack(): - cmd = ['rospack', 'cflags-only-I'] - try: - out = subprocess.Popen(cmd, shell=False, stdout=subprocess.PIPE).stdout - except: - return [] - line = out.readline()[:-1].split(" ") - includes = [] - for include in line: - if include.startswith(os.path.expanduser('~')): - includes += ['-I', include] - else: - includes += ['-isystem', include] - return filter(lambda a: a != ' ', includes) - def DirectoryOfThisScript(): return os.path.dirname(os.path.abspath(__file__)) -- 2.49.0 From be2c10961e3da53dafc530f70cf95a537a1115eb Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Tue, 18 Oct 2016 13:52:33 +0100 Subject: [PATCH 06/16] vim: update default ycm_extra_conf flags Use some sane defaults. * c++14 * /usr/include * /usr/local/include * /usr/include/qt --- vim/ycm_extra_conf.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index 0e3b5da..f0e3679 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -15,9 +15,12 @@ def FlagsForFile(filename, **kwargs): # '-Wno-variadic-macros', # '-fexceptions', # '-DNDEBUG', - '-std=c++11', + '-std=c++14', '-stdlib=libstdc++', '-x', 'c++', + '-isystem', '/usr/include', + '-isystem', '/usr/local/include', + '-isystem', '/usr/include/qt', '-I', '.', '-I', './include', ] -- 2.49.0 From 699839725fb8204b8381035f3b230f65da9d3f89 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:18:49 +0100 Subject: [PATCH 07/16] awesome: add key binding to lock --- awesome/bindings.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/awesome/bindings.lua b/awesome/bindings.lua index c57c87a..d21b616 100644 --- a/awesome/bindings.lua +++ b/awesome/bindings.lua @@ -95,7 +95,9 @@ globalkeys = awful.util.table.join(globalkeys, awful.key({ }, "XF86AudioMute", function () awful.util.spawn("ponymix toggle") end), awful.key({ modkey }, "F10", function () awful.util.spawn("ponymix toggle") end), awful.key({ modkey }, "F11", function () awful.util.spawn("ponymix decrease 5") end), - awful.key({ modkey }, "F12", function () awful.util.spawn("ponymix increase 5") end) + awful.key({ modkey }, "F12", function () awful.util.spawn("ponymix increase 5") end), + -- Lock + awful.key({ modkey, "Control" }, "Escape", function () awful.util.spawn("xautolock -locknow") end) ) -- Client keys {{{1 -- 2.49.0 From 0740abdf646bede29ee65b17f767ed9d6dd9cdd7 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:20:12 +0100 Subject: [PATCH 08/16] awesome: add function to check if host has battery --- awesome/topbar.lua | 2 +- awesome/utils.lua | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/awesome/topbar.lua b/awesome/topbar.lua index 91b04fa..b816365 100644 --- a/awesome/topbar.lua +++ b/awesome/topbar.lua @@ -93,7 +93,7 @@ for s = 1, screen.count() do right_layout:add(separator) right_layout:add(require("widgets/awesompd")) right_layout:add(require("widgets/volume_widget")) - if utils.host == "chronos" then + if utils.has_battery() then right_layout:add(separator) right_layout:add(require("widgets/battery_widget")) end diff --git a/awesome/utils.lua b/awesome/utils.lua index 0c56131..357d8b6 100644 --- a/awesome/utils.lua +++ b/awesome/utils.lua @@ -82,4 +82,8 @@ function utils.globalkeys.append(keys) globalkeys = awful.util.table.join(globalkeys, keys) end +function utils.has_battery() + return utils.is_dir("/sys/class/power_supply/BAT0") +end + return utils -- 2.49.0 From 651a2af74ded7332536762fe92aa93e7be18f776 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:47:54 +0100 Subject: [PATCH 09/16] awesome: network_widget for uh laptop --- awesome/widgets/network_widget.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/awesome/widgets/network_widget.lua b/awesome/widgets/network_widget.lua index 4be6982..5b562af 100644 --- a/awesome/widgets/network_widget.lua +++ b/awesome/widgets/network_widget.lua @@ -14,5 +14,8 @@ end if utils.host == "sb-arch" then widget = net_widget.indicator({interfaces={"enp0s31f6"}, command_mode="newer", font='monospace'}) end +if utils.host == "UH-LPT044" then + widget = net_widget.wireless({interface="wlp4s0", command_mode="newer", font='monospace'}) +end return widget -- 2.49.0 From 69d81ac5dc85a3009d6b2fade2595b6013969b18 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:48:49 +0100 Subject: [PATCH 10/16] fixup! awesome: add function to check if host has battery --- awesome/utils.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/awesome/utils.lua b/awesome/utils.lua index 357d8b6..0f12be1 100644 --- a/awesome/utils.lua +++ b/awesome/utils.lua @@ -9,6 +9,10 @@ utils.globalkeys = { } local host = io.popen("hostname") utils.host = host:read("*l") +function utils.is_dir(path) + return os.execute(('[ -d "%s" ]'):format(path)) +end + function utils.run_or_kill(prg, cprop, screen) if not prg then do return nil end -- 2.49.0 From aa0af76a8a83b2fff89722dee91ce5abc2fde036 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:49:49 +0100 Subject: [PATCH 11/16] vim: fix togglelist mappings --- vim/after/plugin/togglelist.vim | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/after/plugin/togglelist.vim b/vim/after/plugin/togglelist.vim index 01ba8de..8eb7b2b 100644 --- a/vim/after/plugin/togglelist.vim +++ b/vim/after/plugin/togglelist.vim @@ -61,7 +61,7 @@ endfunction nmap [oq :copen nmap ]oq :cclose -nmap coq :call ToggleLocationList() +nmap coq :call ToggleQuickfixList() nmap [ol :lopen nmap ]ol :lclose -nmap col :call ToggleQuickfixList() +nmap col :call ToggleLocationList() -- 2.49.0 From 2acd6476ec74d9b379d1c95c33b3068827eed743 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:54:40 +0100 Subject: [PATCH 12/16] vim: add .hpp files to fswitch --- vim/ftplugin/cpp.vim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vim/ftplugin/cpp.vim b/vim/ftplugin/cpp.vim index af391a1..7631f49 100644 --- a/vim/ftplugin/cpp.vim +++ b/vim/ftplugin/cpp.vim @@ -17,7 +17,7 @@ let b:load_doxygen_syntax = 1 augroup fswitch au BufEnter *.h let b:fswitchdst = 'cpp,c' au BufEnter *.h let b:fswitchlocs = 'reg:|include.*|source|' - au BufEnter *.cpp let b:fswitchdst = 'h' + au BufEnter *.cpp let b:fswitchdst = 'hpp,h' au BufEnter *.cpp let b:fswitchlocs = 'reg:|source|include/**|' augroup END -- 2.49.0 From 233499b0481ec5a78acca487648f2b8e121f2429 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 08:58:01 +0100 Subject: [PATCH 13/16] vim: add close preview mapping --- vim/after/plugin/togglelist.vim | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/vim/after/plugin/togglelist.vim b/vim/after/plugin/togglelist.vim index 8eb7b2b..dbb06f1 100644 --- a/vim/after/plugin/togglelist.vim +++ b/vim/after/plugin/togglelist.vim @@ -59,9 +59,10 @@ function! s:ToggleUnite() UniteResume endfunction -nmap [oq :copen -nmap ]oq :cclose -nmap coq :call ToggleQuickfixList() -nmap [ol :lopen -nmap ]ol :lclose -nmap col :call ToggleLocationList() +nnoremap [oq :copen +nnoremap ]oq :cclose +nnoremap coq :call ToggleQuickfixList() +nnoremap [ol :lopen +nnoremap ]ol :lclose +nnoremap col :call ToggleLocationList() +nnoremap cop :pclose -- 2.49.0 From 0637757f6cc057218ecf0000c44821946df476da Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 09:01:11 +0100 Subject: [PATCH 14/16] vim: skip preview window when moving between windows I'm not entirely sure about this. It does help a lot for not giving focus to the ycm doc window. But it also prevents focusing the fugitive status window. It can still be reached with gs though. Maybe this needs a function that checks what the content of the preview window is and skip conditionally. --- vim/vimrc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index c6aee80..ef35da8 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -435,9 +435,9 @@ nnoremap zx zMzxzt map :ls:b -" move between windows -nnoremap w -nnoremap W +" move between windows (skip previewwindow) +nnoremap w:if &previewwindow \| wincmd w \| endif +nnoremap W:if &previewwindow \| wincmd W \| endif "xterm mouse with middleclick paste nnoremap i -- 2.49.0 From bee0624043768e9683cd24df97499b0282471b55 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 09:05:27 +0100 Subject: [PATCH 15/16] vim: don't ag hidden files --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index ef35da8..9338067 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -647,7 +647,7 @@ let g:unite_source_grep_max_candidates = 2000 if executable('ag') " Use ag in unite grep source. let g:unite_source_grep_command = 'ag' - let g:unite_source_grep_default_opts = '--smart-case --vimgrep --hidden --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' + let g:unite_source_grep_default_opts = '--smart-case --vimgrep --ignore ''.hg'' --ignore ''.svn'' --ignore ''.git'' --ignore ''.bzr''' let g:unite_source_grep_recursive_opt = '' end nnoremap [unite]a :Unite grep:.:: @@ -656,7 +656,7 @@ command! -nargs=1 Ag Unite grep:.:: " unite-file_rec {{{3 if executable('ag') " Use ag in unite rec source - let g:unite_source_rec_async_command = 'ag --follow --nocolor --nogroup --hidden -g ""' + let g:unite_source_rec_async_command = ['ag', '--follow', '--nocolor', '--nogroup', '-g', ''] end nnoremap [unite]f :Unite -start-insert file_rec/async call unite#custom#source('file_rec/async', 'sorters', 'sorter_selecta') -- 2.49.0 From 8b652b5ebfdd3735f276ac54caff74df6f162eb6 Mon Sep 17 00:00:00 2001 From: Samir Benmendil Date: Mon, 24 Oct 2016 09:14:28 +0100 Subject: [PATCH 16/16] vim: global ycm_extra_conf This will search for a compile_commands.json file in any subdirectory and use that to get flags. Revert to some simple default flags. --- vim/ycm_extra_conf.py | 114 +++++++++++++++++++++++++----------------- 1 file changed, 67 insertions(+), 47 deletions(-) diff --git a/vim/ycm_extra_conf.py b/vim/ycm_extra_conf.py index f0e3679..b262265 100644 --- a/vim/ycm_extra_conf.py +++ b/vim/ycm_extra_conf.py @@ -1,13 +1,48 @@ -import os +from glob import glob +from os import path + +import ycm_core + + +def findCompilationDatabaseFolder(dir='.'): + dirs = [path.dirname(f) for f in glob(dir + '/**/compile_commands.json', + recursive=True)] + return dirs + + +def generateQtFlags(): + flags = [] + for p in glob('/usr/include/qt/*/'): + flags += ['-isystem', p] + return flags + + +def isHeader(filename): + ext = path.splitext(filename)[1] + return ext in ['.hpp', '.h'] + + +def GetCompilationInfoForFile(database, filename): + if isHeader(filename): + basename = path.splitext(filename)[0] + for ext in ['.cpp', '.c']: + cpp_file = basename + ext + if path.exists(cpp_file): + compilation_info = database.GetCompilationInfoForFile( + cpp_file) + if compilation_info.compiler_flags_: + return compilation_info + return None + return database.GetCompilationInfoForFile(filename) def FlagsForFile(filename, **kwargs): client_data = kwargs['client_data'] cwd = client_data['getcwd()'] - flags = [ + extra_flags = [ '-Wall', - # '-Wextra', + '-Wextra', # '-Wshadow', # '-Werror', # '-Wc++98-compat', @@ -15,52 +50,37 @@ def FlagsForFile(filename, **kwargs): # '-Wno-variadic-macros', # '-fexceptions', # '-DNDEBUG', - '-std=c++14', - '-stdlib=libstdc++', - '-x', 'c++', - '-isystem', '/usr/include', - '-isystem', '/usr/local/include', - '-isystem', '/usr/include/qt', - '-I', '.', - '-I', './include', ] - relative_to = cwd - final_flags = MakeRelativePathsInFlagsAbsolute(flags, relative_to) + + folders = findCompilationDatabaseFolder(cwd) + if not folders: + folder = None + else: + folder = folders[0] + if len(folders) > 1: + print("Multiple compilation databases found!") + print(folders) + print("Selecting first: %s" % (folder)) + + if folder: + database = ycm_core.CompilationDatabase(folder) + compilation_info = GetCompilationInfoForFile(database, filename) + if not compilation_info: + return None + flags = list(compilation_info.compiler_flags_) + else: + flags = [ + '-std=c++14', + '-stdlib=libstdc++', + '-x', 'c++', + '-isystem', '/usr/include', + '-isystem', '/usr/local/include', + '-I', cwd, + '-I', cwd + '/include', + ] + flags = generateQtFlags() return { - 'flags': final_flags, + 'flags': flags + extra_flags, 'do_cache': True } - - -def DirectoryOfThisScript(): - return os.path.dirname(os.path.abspath(__file__)) - - -def MakeRelativePathsInFlagsAbsolute(flags, working_directory): - if not working_directory: - return list(flags) - new_flags = [] - make_next_absolute = False - path_flags = ['-isystem', '-I', '-iquote', '--sysroot='] - for flag in flags: - new_flag = flag - - if make_next_absolute: - make_next_absolute = False - if not flag.startswith('/'): - new_flag = os.path.join(working_directory, flag) - - for path_flag in path_flags: - if flag == path_flag: - make_next_absolute = True - break - - if flag.startswith(path_flag): - path = flag[len(path_flag):] - new_flag = path_flag + os.path.join(working_directory, path) - break - - if new_flag: - new_flags.append(new_flag) - return new_flags -- 2.49.0