Changeset 920 for lliurex-maker
- Timestamp:
- Mar 22, 2016, 10:18:09 AM (5 years ago)
- Location:
- lliurex-maker/trunk/fuentes
- Files:
-
- 2 added
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-maker/trunk/fuentes/debian/control
r911 r920 15 15 Package: lliurex-maker-new 16 16 Architecture: all 17 Depends: ${misc:Depends}, live-build (>=3.0~a57-1ubuntu25+lliurex1), curl, reprepro, syslinux, syslinux-themes-ubuntu-xenial, gfxboot-theme-ubuntu, syslinux-utils, squashfs-tools 17 Depends: ${misc:Depends}, live-build (>=3.0~a57-1ubuntu25+lliurex1), curl, reprepro, syslinux, syslinux-themes-ubuntu-xenial, gfxboot-theme-ubuntu, syslinux-utils, squashfs-tools, livecd-rootfs 18 18 Description: Contains lliurex-maker 19 19 This package contains the : lliurex-maker -
lliurex-maker/trunk/fuentes/new/usr/bin/lliurex-maker
r919 r920 1 1 #!/bin/bash 2 3 #Define build variables 4 2 5 ARCH="i386" 3 6 FLAVOUR="" 4 7 MIRROR="" 5 INTERACTIVE= false8 INTERACTIVE="false" 6 9 ACTION="" 10 EXTRA_PPAS="" 7 11 EXTRAARGS="" 8 12 EXTRAENV="" 13 14 # Define extra variables 15 16 RED='\033[0;31m' 17 GREEN='\033[0;32m' 18 NC='\033[0m' # No Color 19 20 source /usr/share/lliurex-maker/libs/addPPA # This include function addPPA 21 22 # Functions 9 23 10 24 usage(){ … … 16 30 echo -e "\t -a ARCH | --arch=ARCH" 17 31 echo -e "\t -m MIRROR | --arch=MIRROR" 32 echo -e "\t -p PPA[:Pining_Number] | --ppa=PPA[:Pining_Number]" 18 33 echo -e "\t -i | --interactive" 19 34 echo -e "\t " 35 } 36 37 showResume(){ 38 echo -e "\n\n" 39 echo -e "\t${GREEN}********** Resume **********${NC}\n" 40 echo -e " FLAVOUR : $FLAVOUR " 41 echo -e " MIRROR : $MIRROR " 42 echo -e " ARCH : $ARCH " 43 echo -e "\n\t${GREEN}**********************************${NC}" 44 } 45 46 showErrors(){ 47 if [ $( cat binary.log | grep "^E" | tee errores | wc -l ) -gt 0 ];then 48 echo -e "\n\t${RED}******* Errors **********${NC}\n" 49 cat errores | sed -e "s%^% %g" 50 echo -e "\n\t${RED}*****************************${NC}\n" 51 fi 20 52 } 21 53 … … 26 58 fi 27 59 28 if [ $INTERACTIVE]; then60 if [ "$INTERACTIVE" = "true" ]; then 29 61 EXTRAARGS="--interactive=true " 30 62 fi … … 43 75 } 44 76 77 parseArgs(){ 78 79 while [[ $# > 0 ]]; do 80 key="$1" 81 case $key in 82 build) 83 ACTION="build" 84 FLAVOUR="$2" 85 shift 86 ;; 87 clean) 88 ACTION="clean" 89 ;; 90 -a) 91 ARCH="$2" 92 shift 93 ;; 94 --arch) 95 ARCH=${key##--arch=} 96 ;; 97 -m) 98 MIRROR="$2" 99 shift 100 ;; 101 --mirror) 102 MIRROR=${key##--mirror=} 103 ;; 104 -i|--interactive) 105 INTERACTIVE="true" 106 ;; 107 -p) 108 EXTRA_PPAS="${EXTRA_PPAS} $2" 109 shift 110 ;; 111 --ppa) 112 EXTRA_PPAS="${EXTRA_PPAS} ${key##--ppa=}" 113 ;; 114 esac 115 shift 116 done 45 117 46 while [[ $# > 0 ]]; do 47 key="$1" 48 case $key in 49 build) 50 ACTION="build" 51 FLAVOUR="$2" 52 shift 53 ;; 54 clean) 55 ACTION="clean" 56 ;; 57 -a) 58 ARCH="$2" 59 shift 60 ;; 61 --arch) 62 ARCH=${key##--arch=} 63 ;; 64 -m) 65 MIRROR="$2" 66 shift 67 ;; 68 --mirror) 69 MIRROR=${key##--mirror=} 70 ;; 71 -i|--interactive) 72 INTERACTIVE=true 73 ;; 74 esac 75 shift 76 done 118 } 119 120 parseArgs $@ 77 121 78 122 if [ -z $ACTION ]; then … … 87 131 ;; 88 132 build) 133 #continue 89 134 ;; 90 135 esac 91 136 92 137 138 # Build iso 139 93 140 setEnvironment 94 141 95 142 lb config ${EXTRAARGS} 96 #${EXTRAENV}lb build 143 144 # Append ppas 145 echo ${EXTRA_PPAS} 146 if [ "${EXTRA_PPAS}" != "" ]; then 147 addPPA 148 fi 149 150 #lb build 151 152 showResume 153 showErrors 154 155
Note: See TracChangeset
for help on using the changeset viewer.