Changeset 922

Timestamp:

Mar 22, 2016, 11:24:47 AM (4 years ago)

Author:

kbut

Message:

add ppa working

Location:

lliurex-maker/trunk/fuentes/new/usr

Files:

• bin/lliurex-maker (modified) (2 diffs)
• share/lliurex-maker/libs/addPPA (modified) (2 diffs)

lliurex-maker/trunk/fuentes/new/usr/bin/lliurex-maker

@@ -41 +41 @@
         echo -e "    MIRROR : $MIRROR "
         echo -e "    ARCH : $ARCH "
+        echo -e "    PPA : $EXTRA_PPAS "
         echo -e "\n\t${GREEN}**********************************${NC}"
 }
@@ -140 +141 @@
 setEnvironment
 
+
+if [ "${EXTRA_PPAS}" != "" ]; then
+        EXTRAARGS="${EXTRAARGS} --archives extra-ppas.list"
+fi
+
 lb config ${EXTRAARGS}
 
 # Append ppas
-echo ${EXTRA_PPAS}
 if [ "${EXTRA_PPAS}" != "" ]; then
         addPPA  
 fi
+
 
 #lb build

lliurex-maker/trunk/fuentes/new/usr/share/lliurex-maker/libs/addPPA

@@ -1 +1 @@
 addPPA(){
 
+        mkdir -p config/archives/
         rm -f config/archives/extra-ppas.list.chroot \
               config/archives/extra-ppas.pref.chroot \
-              config/archives/extra-ppas.key.chroot
+              config/archives/extra-ppas.key.chroot || true
         gpg_tmpdir="$(mktemp -d)"
         run_gpg () {
@@ -60 +61 @@
                       config/archives/extra-ppas.pref.binary
         fi
-        lb config --archives extra-ppas.list
 }