[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][master] 3 commits: use ${USER_CMD} in two more places



Title: GitLab

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

  • 75706eff
    by Marc Haber at 2025-08-10T10:44:57+00:00
    use ${USER_CMD} in two more places
    
  • a9cfee31
    by Marc Haber at 2025-08-10T10:44:57+00:00
    Apply 1 suggestion(s) to 1 file(s)
    
    Co-authored-by: Ansgar <ansgar@debian.org>
  • c7f4677f
    by Joerg Jaspert at 2025-08-10T10:45:30+00:00
    Merge branch 'zg/dak-setup' into 'master'
    
    use ${USER_CMD} in two more places
    
    See merge request ftp-team/dak!289

1 changed file:

Changes:

  • setup/dak-setup.sh
    ... ... @@ -84,13 +84,13 @@ dak-setup() {
    84 84
       # Create a minimal dak.conf
    
    85 85
       export DAK_CONFIG="${DAKBASE}/etc/dak.conf"
    
    86 86
       (cd ${setupdir}; ./init_minimal_conf | $USER_CMD tee ${DAK_CONFIG} >/dev/null)
    
    87
    -  $USER_CMD echo 'DB::Role "dak";' | tee -a ${DAK_CONFIG} >/dev/null
    
    87
    +  $USER_CMD tee -a ${DAK_CONFIG} <<< 'DB::Role "dak";' >/dev/null
    
    88 88
     
    
    89 89
       if [[ ! -v DAK_INTEGRATION_TEST ]]; then
    
    90
    -    ln -s ${DAK_ROOT}/dak/dak.py ${DAKBASE}/bin/dak
    
    90
    +    ${USER_CMD} ln -s ${DAK_ROOT}/dak/dak.py ${DAKBASE}/bin/dak
    
    91 91
       else
    
    92 92
         # wrapper to collect coverage information
    
    93
    -    ln -s ${DAK_ROOT}/integration-tests/dak-coverage.sh ${DAKBASE}/bin/dak
    
    93
    +    ${USER_CMD} ln -s ${DAK_ROOT}/integration-tests/dak-coverage.sh ${DAKBASE}/bin/dak
    
    94 94
       fi
    
    95 95
     
    
    96 96
       # Update the database schema
    


  • Reply to: