← Back to branch summary

~inx-devel/inx/buildinx

« back to all changes in this revision

Viewing changes to buildinx

  • Committer: Peter Garrett
  • Date: 2008-09-20 18:55:02 UTC
  • Revision ID: inx-one@optusnet.com.au-20080920185502-r2ayppblzz4njyqr
Added a .ceni_workaround marker file to avoid re-downloads etc.

Show diffs side-by-side

added added

removed removed

Lines of Context:
buildinx
222
222
                if [ $EXTRAS ]; then echo "deb $PACKAGEMIRROR $EXTRAS" >> ./chroot/etc/apt/sources.list ; fi
223
223
 
224
224
                # Ceni is a ring-in from Sidux... download the deb to chroot/var/cache/apt/archives...
225
 
                wget --continue -T 5 "$INX_SITE"/"$INX_DIR"/"$CENI_DEB" -O ./chroot/var/cache/apt/archives/"$CENI_DEB"
226
 
 
 
225
                if ! [ -f .ceni_workaround ] ; then
 
226
                    wget --continue -T 5 "$INX_SITE"/"$INX_DIR"/"$CENI_DEB" -O ./chroot/var/cache/apt/archives/"$CENI_DEB"
 
227
                fi
 
228
                
227
229
                if ! chroot ./chroot apt-get update ; then
228
230
                        echo -e "\nApt-get update in the chroot failed. Please check your mirror and network. Exiting...\n"
229
231
                        exit 1
256
258
                        # Try to fix unconfigured packages - e.g. vifm causes some issues with hardy. Ceni needs this too?
257
259
                        chroot ./chroot aptitude -f install     # 'apt-get -f install' seems to fail here, though it isn't fatal.
258
260
                        chroot ./chroot dpkg --configure --pending # Never rely on the frontend to do a backends job :)
259
 
                        chroot ./chroot dpkg -i /var/cache/apt/archives/"$CENI_DEB" # Work-around for ceni... :/
 
261
                        if ! [ -f .ceni_workaround ] ; then
 
262
                            chroot ./chroot dpkg -i /var/cache/apt/archives/"$CENI_DEB" # Work-around for ceni... :/
 
263
                            touch .ceni_workaround
 
264
                        fi    
260
265
                        chroot ./chroot apt-get clean           #  We don't want cache bloating the final ISO
261
266
                else
262
 
                        chroot ./chroot dpkg -i /var/cache/apt/archives/"$CENI_DEB" # Work-around for ceni... :/
 
267
                        if ! [ -f .ceni_workaround ] ; then
 
268
                            chroot ./chroot dpkg -i /var/cache/apt/archives/"$CENI_DEB" # Work-around for ceni... :/
 
269
                            touch .ceni_workaround
 
270
                        fi    
263
271
                        chroot ./chroot apt-get clean
264
272
                fi
265
273
        else
393
401
                sed -i 's_application/ogg_#application/ogg_g' chroot/etc/mailcap
394
402
                echo "application/ogg; playinx '%s'; test=test -z \"\$DISPLAY\"; needsterminal" >> chroot/etc/mailcap
395
403
                echo "application/x-ogg; playinx '%s'; test=test -z \"\$DISPLAY\"; needsterminal" >> chroot/etc/mailcap
 
404
                
396
405
                touch .general_tweaks
397
406
        fi
398
407