Revision 41933 trunk/org.gvsig.desktop/org.gvsig.desktop.framework/org.gvsig.andami/src/main/resources-application/tools/make-portable

View differences:

make-portable
146 146
    done
147 147
}
148 148

  
149

  
150 149
function install_packages() {
151 150
    INSTALL_FOLDER="$1"
152 151
    PACKAGES_FOLDER="$2"
......
155 154
    logger_info "Processing $(basename $PACKAGES_FOLDER) packages"
156 155
    for PACKAGE_PATH in $PACKAGES_FOLDER/*.gvspkg
157 156
    do
158
      PACKAGE_NAME="$(basename $PACKAGE_PATH)"
159
      if expr "$PACKAGE_NAME" : "gvSIG-desktop-[0-9.]*-translations[.]" >/dev/null ; then
160
        install_translations "$INSTALL_FOLDER" "$PACKAGE_PATH"
161
      elif expr "$PACKAGE_NAME" : "gvSIG-desktop-[0-9.]*-symbols[.]"  >/dev/null ; then
162
        install_symbols "$INSTALL_FOLDER" "$PACKAGE_PATH" 
163
      elif expr "$PACKAGE_NAME" : "gvSIG-desktop-[0-9.]*-EPSG_"  >/dev/null ; then
164
        install_jCRS_EPSG "$INSTALL_FOLDER" "$PACKAGE_PATH" 
165
      else
166
        install_plugin "$INSTALL_FOLDER" "$PACKAGE_PATH"
157
      if [ -f "$PACKAGE_PATH" ] ; then
158
        PACKAGE_NAME="$(basename $PACKAGE_PATH)"
159
        if expr "$PACKAGE_NAME" : "gvSIG-desktop-[0-9.]*-translations[.]" >/dev/null ; then
160
          install_translations "$INSTALL_FOLDER" "$PACKAGE_PATH"
161
        elif expr "$PACKAGE_NAME" : "gvSIG-desktop-[0-9.]*-symbols[.]"  >/dev/null ; then
162
          install_symbols "$INSTALL_FOLDER" "$PACKAGE_PATH"
163
        elif expr "$PACKAGE_NAME" : "gvSIG-desktop-[0-9.]*-EPSG_"  >/dev/null ; then
164
          install_jCRS_EPSG "$INSTALL_FOLDER" "$PACKAGE_PATH"
165
        else
166
          install_plugin "$INSTALL_FOLDER" "$PACKAGE_PATH"
167
        fi
167 168
      fi
168 169
    done
169 170
}
......
206 207
    rm -f $INSTALL_FOLDER/gvsig-package-installer.*
207 208
    rm -f $INSTALL_FOLDER/*.cmd
208 209
    rm -f $INSTALL_FOLDER/check.sh
209
    rm -rf "$INSTALL_FOLDER/gvSIG/extensiones/jre_6_windows_i586"
210
    rm -rf "$INSTALL_FOLDER/gvSIG/extensiones/jre_7_windows_i586"
210 211
    rm -rf $INSTALL_FOLDER/tools/*.cmd
211 212
    rm -rf $INSTALL_FOLDER/tools/*.exe
212 213
    rm -rf $INSTALL_FOLDER/tools/gvsig-desktop-portable.xml
......
230 231
    rm -f $INSTALL_FOLDER/gvsig-package-installer.*
231 232
}
232 233

  
234
function zipfolder() {
235
    echo zip -qyr9 "$1" "$2"
236
    if type zip >/dev/null 2>/dev/null
237
    then
238
	zip -qyr9 "$1" "$2"
239
    else
240
      echo "
241
	
242
	WARNING: zip command not found. 
243
	         $1 not compressed.
244
	
245
"
246
    fi
247
}
248

  
233 249
function mkdist() {
234 250
    cd $BASEFOLDER/standard
235 251

  
......
237 253
    export PORTABLE_OSNAME="$2"
238 254
    export PORTABLE_PLATFORM="$3"
239 255
    export PORTABLE_VERSION=$(expr *.zip : "gvSIG-desktop-\\([0-9.]*-[0-9]*\\)")
240
    export PORTABLE_STATUS=$(expr *.zip : "gvSIG-desktop-[0-9.]*-[0-9]*-\\([a-zA-Z]*\)")
241
    export PORTABLE_NAME="gvsig-desktop-$PORTABLE_VERSION-${PORTABLE_OS}-${PORTABLE_PLATFORM}"
256
    export PORTABLE_STATUS=$(expr *.zip : "gvSIG-desktop-[0-9.]*-[0-9]*-\\([a-zA-Z]*[0-9]*\)")
257
    export PORTABLE_NAME="gvsig-desktop-$PORTABLE_VERSION-${PORTABLE_STATUS}-${PORTABLE_OS}-${PORTABLE_PLATFORM}"
242 258
    
243 259
    export INSTALL_FOLDER="$TARGET/$PORTABLE_NAME"
244 260

  
......
285 301
    
286 302
    logger_info "Compresing ${PORTABLE_OSNAME}-${PORTABLE_PLATFORM} portable (this take a moment)"
287 303
    cd "$TARGET"
288
    zip -qyr9 "${PORTABLE_NAME}.zip" "${PORTABLE_NAME}"
304
    zipfolder "${PORTABLE_NAME}.zip" "${PORTABLE_NAME}"
289 305
    
290 306
    logger_info "Removing temporary package folder"
291 307
    rm -rf $TARGET/packages-${PORTABLE_OS}-${PORTABLE_PLATFORM}

Also available in: Unified diff