Ignore:
Timestamp:
Jun 16, 2007, 12:31:24 AM (13 years ago)
Author:
jmpp@…
Message:

Don't check for *.mpsaved files to discern whether or not we need to perform the updates on the conf files,
but actually for a .mprename_update indicator file. This allows people to remove the *.mpsaved files if
they don't want them any longer and still not have the upgrade checks performed on their conf files.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Makefile.in

    r26177 r26215  
    7373## 7) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
    7474## 8) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
    75         [ ! \( -f ${sysconfdir}/macports/ports.conf -a ! -f ${sysconfdir}/macports/macports.conf.mpsaved \) ] || { \
     75        [ ! \( -f ${sysconfdir}/macports/ports.conf -a ! -f ${sysconfdir}/macports/.mprename_update \) ] || { \
    7676                mv -v ${sysconfdir}/macports/ports.conf ${sysconfdir}/macports/macports.conf.mpsaved; \
    7777                sed 's/etc\/ports/etc\/macports/g' ${sysconfdir}/macports/macports.conf.mpsaved > ${sysconfdir}/macports/macports.conf.tmp && \
     
    9191                sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
    9292                        mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
     93                echo "MacPorts rename update done!" > ${sysconfdir}/macports/.mprename_update; \
    9394        }
    9495
     
    9697## 1) new MacPorts rsync server;
    9798## 2) new default value for the ports tree.
    98         [ ! \( -f ${sysconfdir}/macports/sources.conf -a ! -f ${sysconfdir}/macports/sources.conf.mpsaved \) ] || { \
     99        [ ! \( -f ${sysconfdir}/macports/sources.conf -a ! -f ${sysconfdir}/macports/.mprename_update \) ] || { \
    99100                cp -v ${sysconfdir}/macports/sources.conf ${sysconfdir}/macports/sources.conf.mpsaved; \
    100101                sed 's/darwinports/macports/g' ${sysconfdir}/macports/sources.conf > ${sysconfdir}/macports/sources.conf.tmp && \
     
    102103                sed 's/dpupdate\/dports/release\/ports\//g' ${sysconfdir}/macports/sources.conf > ${sysconfdir}/macports/sources.conf.tmp && \
    103104                        mv -v ${sysconfdir}/macports/sources.conf.tmp ${sysconfdir}/macports/sources.conf; \
     105                echo "MacPorts rename update done!" > ${sysconfdir}/macports/.mprename_update; \
    104106        }
    105107
     
    113115## 7) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
    114116## 8) finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name.
    115         [ ! \( -f $${HOME}/.macports/ports.conf -a ! -f $${HOME}/.macports/macports.conf.mpsaved \) ] || { \
     117        [ ! \( -f $${HOME}/.macports/ports.conf -a ! -f $${HOME}/.macports/.mprename_update \) ] || { \
    116118                mv -v $${HOME}/.macports/ports.conf $${HOME}/.macports/macports.conf.mpsaved; \
    117119                sed 's/etc\/ports/etc\/macports/g' $${HOME}/.macports/macports.conf.mpsaved > $${HOME}/.macports/macports.conf.tmp && \
     
    131133                sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    132134                        mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
     135                echo "MacPorts rename update done!" > ${sysconfdir}/macports/.mprename_update; \
    133136        }
    134137
Note: See TracChangeset for help on using the changeset viewer.