On Wed, Aug 5, 2020 at 10:49 PM Dave Airlie <[email protected]> wrote: > > > > On Thu, 6 Aug. 2020, 06:19 Jani Nikula, <[email protected]> wrote: >> >> On Wed, 05 Aug 2020, Daniel Vetter <[email protected]> wrote: >> > Setup instructions don't match the code anymore, ever since the split >> > to a separate repo we don't set it up automatically anymore. Readd >> > that - the right link and all was already there. >> >> I think at some point we decided the recommended way to install dim was >> to clone maintainer-tools, i.e. having a random dim script somewhere was >> not a recommended starting point. > > > The current docs suggest we never finished the point though, it grabs a dim > from gitlab raw.
Yeah setup is also confused, since it still offers to create $DIM_PREFIX. And it's kinda hard to start out with a maintainer-tools checkout in $DIM_PREFIX/maintainer-tools if that directory doesn't even exist yet. I guess we can flip this all around, but I figured this here is the more minimal patch to make it all at least self-consistent again. -Daniel > > Dave. >> >> >> BR, >> Jani. >> >> >> >> > >> > Reported-by: Dave Airlie <[email protected]> >> > Cc: Dave Airlie <[email protected]> >> > Signed-off-by: Daniel Vetter <[email protected]> >> > --- >> > dim | 8 ++++++-- >> > 1 file changed, 6 insertions(+), 2 deletions(-) >> > >> > diff --git a/dim b/dim >> > index 1e61fe2f9ed9..3937f440219f 100755 >> > --- a/dim >> > +++ b/dim >> > @@ -2274,8 +2274,12 @@ function dim_setup >> > fi >> > >> > if [[ ! -d "$(git_dir maintainer-tools)" ]]; then >> > - echoerr "No maintainer-tools git checkout found in >> > 'maintainer-tools'." >> > - echoerr "dim update will not work. Please fix." >> > + if ask_user "No maintainer-tools git checkout found in >> > 'maintainer-tools'. Clone upstream?"; then >> > + git clone "$maintainer_tools_https" "mantainer-tools" >> > + else >> > + echoerr "No maintainer-tools git checkout found in >> > 'maintainer-tools'." >> > + echoerr "dim update will not work. Please fix." >> > + fi >> > fi >> > >> > setup_aux_checkout rerere-cache $drm_tip_ssh drm-rerere >> >> -- >> Jani Nikula, Intel Open Source Graphics Center >> _______________________________________________ >> dim-tools mailing list >> [email protected] >> https://lists.freedesktop.org/mailman/listinfo/dim-tools -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dim-tools mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dim-tools
