Magellan Linux

Diff of /trunk/pkgtools/svn-revup.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1330 by niro, Tue May 31 17:42:39 2011 UTC revision 2109 by niro, Mon May 13 11:38:32 2013 UTC
# Line 4  die() { echo "Error: $@"; exit 1; } Line 4  die() { echo "Error: $@"; exit 1; }
4    
5  # fake  # fake
6  sminclude() { true; }  sminclude() { true; }
7    msetfeature() { true; }
8    march() { true; }
9    marchdepend() { true; }
10    marchsdepend() { true; }
11    mlibdir() { true; }
12    
13  SVNCOMMIT="true"  SVNCOMMIT="false"
14  DELETEOLD="true"  DELETEOLD="true"
15    OPENINEDITOR="false"
16    DEFAULTEDITOR="geany"
17    
18  SMAGEFILE="$1"  SMAGEFILE="$1"
19  [[ -z ${SMAGEFILE} ]] && die "No smage2 file given"  [[ -z ${SMAGEFILE} ]] && die "No smage2 file given"
# Line 30  then Line 37  then
37   cp ${BASEDIR}md5/${BASEMD5} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.}   cp ${BASEDIR}md5/${BASEMD5} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.}
38  fi  fi
39    
40  if [[ ${SVNCOMMIT} = true ]]  COMMITLINE=""
 then  
  COMMITLINE=""  
41    
42   if [[ ${DELETEOLD} = true ]]  if [[ ${DELETEOLD} = true ]]
43    then
44     svn del ${SMAGEFILE} || die
45     COMMITLINE="${COMMITLINE} ${SMAGEFILE}"
46     if [[ ${HAVEMD5} = yes ]]
47   then   then
48   svn del ${SMAGEFILE} || die   svn del ${BASEDIR}/md5/${BASEMD5} || die
49   COMMITLINE="${COMMITLINE} ${SMAGEFILE}"   COMMITLINE="${COMMITLINE} ${BASEDIR}/md5/${BASEMD5}"
  if [[ ${HAVEMD5} = yes ]]  
  then  
  svn del ${BASEDIR}/md5/${BASEMD5} || die  
  COMMITLINE="${COMMITLINE} ${BASEDIR}/md5/${BASEMD5}"  
  fi  
50   fi   fi
51    fi
52    
53    if [[ ${SVNCOMMIT} = true ]]
54    then
55   if [[ ${HAVEMD5} = yes ]]   if [[ ${HAVEMD5} = yes ]]
56   then   then
57   svn add ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.} || die   svn add ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.} || die
58   COMMITLINE="${COMMITLINE} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.}"   COMMITLINE="${COMMITLINE} ${BASEDIR}md5/${BASEMD5/-${PBUILD}./-${newpbuild}.}"
59   fi   fi
60   svn add ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.} || die   svn add ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.} || die
61    
62   COMMITLINE="${COMMITLINE} ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.}"   COMMITLINE="${COMMITLINE} ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.}"
63   svn commit -m "${MESSAGE}" ${COMMITLINE} || die   svn commit -m "${MESSAGE}" ${COMMITLINE} || die
64  fi  fi
65    
66    if [[ ${OPENINEDITOR} = true ]]
67    then
68     if [[ ! -x $(type -P ${DEFAULTEDITOR}) ]]
69     then
70     DEFAULTEDITOR="nano -w"
71     fi
72    
73     ${DEFAULTEDITOR} ${BASEDIR}${BASEFILE/-${PBUILD}./-${newpbuild}.}
74    fi

Legend:
Removed from v.1330  
changed lines
  Added in v.2109