try to fix activity and sample content installation

1 files changed, 60 insertions, 65 deletions

diff --git a/soas-sugar.ks b/soas-sugar.ks
index f92305c..547adfc 100644
--- a/soas-sugar.ks
+++ b/soas-sugar.ks
@@ -64,7 +64,61 @@ gstreamer-plugins-espeak
 
 %end
 
+%post --nochroot
+
+# download additional honey activities
+ASLO="$ASLO 4042" # InfoSlicer
+ASLO="$ASLO 4034" # Moon
+ASLO="$ASLO 4046" # JigsawPuzzle
+ASLO="$ASLO 4047" # SliderPuzzle
+ASLO="$ASLO 4063" # Memorize
+ASLO="$ASLO 4038" # Speak
+ASLO="$ASLO 4037" # CartoonBuilder
+ASLO="$ASLO 4044" # FlipSticks
+ASLO="$ASLO 4064" # JokeMachine
+ASLO="$ASLO 4029" # IRC
+ASLO="$ASLO 4054" # FreeCell
+ASLO="$ASLO 4039" # ViewSlides
+ASLO="$ASLO 4073" # StoryBuilder
+ASLO="$ASLO 4074" # Poll
+ASLO="$ASLO 4058" # Develop
+ASLO="$ASLO 4078" # Labyrinth
+ASLO="$ASLO 4082" # Paint
+ASLO="$ASLO 4081" # Record
+ASLO="$ASLO 4059" # TamTamEdit
+ASLO="$ASLO 4060" # TamTamJam
+ASLO="$ASLO 4061" # TamTamMini
+ASLO="$ASLO 4062" # TamTamSynth Lab
+ASLO="$ASLO 4050" # Colors
+ASLO="$ASLO 4089" # Library
+
+WD=$PWD
+BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey
+
+mkdir -p $BUNDLES_DIR
+cd $BUNDLES_DIR
+
+for id in $ASLO ; do
+  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
+done
+
+# pull sample content for the journal
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/south_america.pdf > south_america.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/africa.pdf > africa.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/asia.pdf > asia.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/central_america.pdf > central_america.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/europe.pdf > europe.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/middle_east.pdf > middle_east.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/north_america.pdf > north_america.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/oceania.pdf > oceania.pdf
+curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/southeast_asia.pdf > southeast_asia.pdf
+
+cd $WD
+
+%end
+
 %post
+
 cat > /etc/sysconfig/desktop <<EOF
 DISPLAYMANAGER=/usr/bin/slim-dynwm
 EOF
@@ -129,10 +183,6 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # setup activity directory
 mkdir -p /home/liveuser/Activities
 chown liveuser:liveuser /home/liveuser/Activities
-chown -R liveuser:liveuser /usr/share/sugar/honey
-for bundle in \`find /usr/share/sugar/honey -maxdepth 1\` ; do
-ln -s \$bundle /home/liveuser/Activities
-done
 
 # add more activities to the favorites
 cat > /usr/share/sugar/data/activities.defaults << FOE
@@ -156,73 +206,17 @@ vu.lux.olpc.Speak
 org.worldwideworkshop.olpc.JigsawPuzzle
 FOE
 
-EOF
+# make sure to be able to copy-to-journal
+dbus-uuidgen --ensure
 
-%end
-
-%post --nochroot
-
-ASLO="$ASLO 4042" # InfoSlicer
-ASLO="$ASLO 4034" # Moon
-ASLO="$ASLO 4046" # JigsawPuzzle
-ASLO="$ASLO 4047" # SliderPuzzle
-ASLO="$ASLO 4063" # Memorize
-ASLO="$ASLO 4038" # Speak
-ASLO="$ASLO 4037" # CartoonBuilder
-ASLO="$ASLO 4044" # FlipSticks
-ASLO="$ASLO 4064" # JokeMachine
-ASLO="$ASLO 4029" # IRC
-ASLO="$ASLO 4054" # FreeCell
-ASLO="$ASLO 4039" # ViewSlides
-ASLO="$ASLO 4073" # StoryBuilder
-ASLO="$ASLO 4074" # Poll
-ASLO="$ASLO 4058" # Develop
-ASLO="$ASLO 4078" # Labyrinth
-ASLO="$ASLO 4082" # Paint
-ASLO="$ASLO 4081" # Record
-ASLO="$ASLO 4059" # TamTamEdit
-ASLO="$ASLO 4060" # TamTamJam
-ASLO="$ASLO 4061" # TamTamMini
-ASLO="$ASLO 4062" # TamTamSynth Lab
-ASLO="$ASLO 4050" # Colors
-ASLO="$ASLO 4089" # Library
-
-WD=$PWD
-BUNDLES_DIR=$INSTALL_ROOT/usr/share/sugar/honey
-
-mkdir -p $BUNDLES_DIR
-cd $BUNDLES_DIR
-
-for id in $ASLO ; do
-  curl -L http://activities.sugarlabs.org/en-US/sugar/downloads/latest/$id > $id.xo
-done
+# switch to honey directory and install activities
+cd /usr/share/sugar/honey
 
 for file in *.xo ; do
-    unzip $file
+    sugar-install-bundle $file
     rm $file
 done
 
-# pull sample content for the journal
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/south_america.pdf > south_america.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/africa.pdf > africa.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/asia.pdf > asia.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/central_america.pdf > central_america.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/europe.pdf > europe.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/middle_east.pdf > middle_east.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/north_america.pdf > north_america.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/oceania.pdf > oceania.pdf
-curl -L http://dev.sugarlabs.org/raw-attachment/ticket/840/southeast_asia.pdf > southeast_asia.pdf
-
-cd $WD
-
-%end
-
-%post
-
-cat >> /etc/rc.d/init.d/livesys << EOF
-
-cd /usr/share/sugar/honey
-
 # add sample content to journal
 copy-to-journal south_america.pdf -t "South America World Factbook Map (PDF)" -m "application/pdf" -d "South America is the southern continent of the Americas, situated entirely in the Western Hemisphere and mostly in the Southern Hemisphere, with a relatively small portion in the Northern Hemisphere. It is bordered on the west by the Pacific Ocean and on the north and east by the Atlantic Ocean; North America and the Caribbean Sea lie to the northwest." -T "CHILE BRAZIL URUGUAY PARAGUAY BOLIVIA COLOMBIA ECUADOR SURINAME PERU PANAMA NICARAGUA COSTA RICA HONDURAS TRINIDAD AND GUYANA BARBADOS TOBAGO THE GRENADINES ST. LUCIA GRENADA Martinique VENEZUELA ST. VINCENT AND French Guiana Aruba Antilles Netherlands Falkland Islands Islas Malvinas South Sandwich Islands ARGENTINA Equator Amazon Lago Titicaca Toc Orinoco Strait of Magellan Atlantic Pacific Caribbean Sea Maracaibo Cali Guayaquil Recife Salvador São Paulo Rio de Janeiro Córdoba Rosario Pôrto Alegre Horizonte Antofagasta Concepción Puerto Montt Mendoza La Plata San Miguel de Tucumán Arica Santa Cruz Cochabamba Arequipa Manaus Natal Fortaleza Santarém Cusco Iquitos Trujillo Huánuco Piura Cartagena Barranquilla Ciudad Curitiba Teresina Ushuaia Punta Arenas Valparaíso Bahía Blanca Medellín Caracas Georgetown Paramaribo Cayenne Quito Lima La Paz Asunción Santiago Buenos Aires Montevideo Stanley Port-of-Spain Boa Vista Macapá Belém São Luís Velho Pôrto Branco Rio Goiânia Brasília Cúcuta Valencia Barquisimeto Río Gallegos Campo Grande Uberlândia Belo Salta Santa Fe Maceió Bogotá Panama San José Managua Tegucigalpa Santos Florianópolis San Cristóbal Guayana Vitória Iquique Resistencia Salto Sucre Potosí San Carlos de Bariloche Comodoro Rivadavia Cuiabá Trinidad Mar del Plata SOUTH AMERICA ANDES ALTIPLANOA Cerro Aconcagua MATO GROSSO AMAZON BASIN ARCHIPIÉLAGO JUAN FERNÁNDEZ Isla San Félix Isla San Ambrosio Isla de Malpelo Isla de San Andrés Laguna del Carbón Cape Horn"
 copy-to-journal africa.pdf -t "Africa World Factbook Map (PDF)" -m "application/pdf" -d "Africa is the second-largest and second most-populous continent, after Asia. With a billion people (as of 2009) in 61 territories, it accounts for about 14.8% of the World's human population. The continent is surrounded by the Mediterranean Sea to the north, the Suez Canal and the Red Sea to the northeast, the Indian Ocean to the southeast, and the Atlantic Ocean to the west." -T "MALI CHAD FASO IRAN TOGO SOUTH BOTSWANA LESOTHO SWAZILAND MADAGASCAR MOZAMBIQUE ZAMBIA ANGOLA TANZANIA KENYA ETHIOPIA EGYPT ARABIA SAUDI MOROCCO MAURITANIA CENTRAL AFRICAN REPUBLIC CAPE VERDE THE GAMBIA SENEGAL NIGERIA SAO TOME AND PRINCIPE GABON TURKEY SPAIN CAMEROON UGANDA RWANDA BURUNDI MALAWI DJIBOUTI ERITREA SOMALIA GUINEA-BISSAU GUINEA SIERRA LEONE GHANA BENIN BURKINA EQUATORIAL GUINEA CÔTE D'IVOIRE ALGERIA SUDAN LIBYA NIGER FRANCE GERMANY POLAND ITALY GREECE UKRAINE U.K. IRE. RUSSIA TURKMENISTAN SYRIA UZBEKISTAN ROM. BELARUS AZER. LEB. QATAR KUWAIT JORDAN ISRAEL CYPRUS U.A.E MAURITIUS Western Sahara ALB. AUS. TUNISIA MALTA ZIMBABWE COMOROS BULG. SLO. CRO. SER. MONT. MACE. HUNG. CZ. REP. SLOV. NETH. BEL. LUX. SWITZ. MOL. BOS. & HER. AND. ARM. GEO. IRAQ BAHR. NAMIBIA YEMEN OMAN ANGOLA Cabinda YEMEN Sicily LIBERIA boundary Socotra SEYCHELLES PORTUGAL Admin. EQUA. GUI. AFG. Sardinia Corsica DEM. REP. OF THE CONGO KAZAKHSTAN St. Helena Ascension St. Helena AFRICA KOS. Strait of Gibraltar North Atlantic Ocean Mediterranean Sea Black Sea Sea of Azov Danube Nile Red Sea Volga Persian Gulf South Atlantic Ocean Gulf of Guinea Arabian Sea Indian Ocean Gulf of Aden Lake Victoria Lake Nyasa Lake Tanganyika Blue Nile White Nile Congo Benue Volta Niger Indian Ocean Mozambique Channel Zambezi Oran Aral Caspian Sea Gulf Sea AFRICA Jerusalem Berlin Warsaw Minsk Kyiv Prague Amsterdam London Dublin Brussels Vienna Budapest Bratislava Ljubljana Zagreb Belgrade Chisinau Bucharest Sofia Skopje Sarajevo Athens Valletta Tunis Algiers Tripoli Cairo Beirut Nicosia Damascus Amman Baghdad Riyadh Bern Rabat Tashkent Ashgabat Baku Doha Muscat Manama Kuwait Sanaa Asmara Abu Dhabi Djibouti Mogadishu Nairobi Ababa Addis N'Djamena Bangui Kinshasa Yaoundé Malabo Lomé São Tomé Brazzaville Libreville Niamey Abuja Novo Porto-Victoria Moroni St. Denis Port Louis Antananarivo Maputo Pretoria Maseru Mbabane Gaborone Windhoek Luanda Lusaka Harare Dar es Salaam Laayoune El Aaiún Nouakchott Praia Dakar Banjul Bamako Bissau Ouagadougou Conakry Freetown Accra Island Glorioso Islands Mayotte Bassas da India Juan de Nova Island Tromelin Island Oran Constantine Fès Casablanca Marrakech Banghazi Alexandria Kano Ogbomoso Ibadan Lagos Douala Pointe-Noire Kisangani Mbuji-Mayi Lubumbashi Bukavu Kitwe Durban Johannesburg Port Elizabeth Cape Town Beira Mombasa Hargeysa Omdurman Moundou Lubango Namibe Walvis Bay Medina Mecca Jiddah Port Sudan Aswan Al Jawf Tombouctou Blantyre Naples Milan Mashhad Esfahan Ankara Adana Izmir Istanbul Tehran Odesa Rostov Lisbon Rome Barcelona Marseille Tabriz Abidjan Yamoussoukro Monrovia Ponta Funchal Las Palmas Delgada Yerevan Aleppo Shiraz Dodoma Zanzibar Al Jizah AZORES MADEIRA ISLANDS CANARY ISLANDS Nouadhibou Mahajanga Toamasina Bandar 'Abbas Juba Zinder Agadez Annobón Tbilisi Reunion Europa Paris Madrid Khartoum Kampala Kigali Bujumbura Lilongwe Kananga Tirana Podgorica Cidade de Nacala Pristina SAHARA Mt. Kilimanjaro Lac'Assal NAMIB DESERT KALAHARI DESERT CONGO BASIN GREAT RIFT VALLEY"
@@ -234,6 +228,7 @@ copy-to-journal north_america.pdf -t "North America World Factbook Map (PDF)" -m
 copy-to-journal oceania.pdf -t "Oceania World Factbook Map (PDF)" -m "application/pdf" -d "Oceania (sometimes Oceanica) is a geographical, often geopolitical, region consisting of numerous lands—mostly islands in the Pacific Ocean and vicinity. The term "Oceania" was coined in 1831 by French explorer Dumont d'Urville. The term is used today in many languages to define one of the continents and is one of eight terrestrial ecozones." -T "Philippine Sea South China Sea Celebes Sea Sulu Sea Luzon Strait Solomon Sea Bismarck Sea Arafura Sea Timor Sea Banda Sea Java Sea Molucca Sea Strait Torres Gulf of Carpentaria North Pacific Ocean South Pacific Ocean Indian Ocean Tasman Sea Coral Sea Great Australian Bight Darling Murray Bass Strait Great Barrier Reef CLIPPERTON FRACTURE ZONE CLARION FRACTURE ZONE MOLOKAI FRACTURE ZONE Wewak Sorong Darwin Surabaya Palu Samarinda Manado Townsville Alice Springs Port Hedland Lae Jayapura Brisbane Perth Sydney Gold Coast Rockhampton Gladstone Mackay Cairns Bunbury Manila Saipan Majuro Melekeok Bandar Seri Begawan Dili Tarawa Funafuti Honiara Port Moresby Apia Pago Papeete Adamstown Port-Vila Suva Alofi Nuku'alofa Avarua Noumea Kingston Canberra Wellington Honolulu Davao Adelaide Melbourne Auckland Christchurch Dunedin Invercargill Hobart Taipei Fuzhou Guangzhou Wenzhou Xiamen Shantou Kao-hsiung Naha Cagayan de Oro Zamboanga Cebu Bacolod Iloilo Makassar Banjarmasin Denpasar Kupang Ambon Hamilton Kalgoorlie Broken Hill Whyalla Bendigo Geelong Mount Isa Newcastle Wollongong Madang Hastings Yaren District Geraldton Esperance Mata-Utu Palikir Hagåtña Tahiti Mururoa Pohnpei Eniwetak Timor Flores Sumba Ceram Celebes Palawan Negros Yap Lord Howe Island RYUKU ISLANDS Sumbawa ÎLES SOCIETY ISLANDS ÎLES TUBUAI KERMADEC KIRIBATI CHATHAM ISLANDS Lombok HAWAIIAN ISLANDS DAITO-SHOTO NAMPO-SHOTO BONIN ISLANDS VOLCANO ISLANDS Samar MARSHALL ISLANDS TUVALU Tokelau SAMOA Northern Mariana Islands SOLOMON ISLANDS KERMADEC ISLANDS American Palmyra Atoll Kingman Reef Johnston Atoll Midway Islands Marcus Island Ashmore and Cartier Islands Oahu PHOENIX ISLANDS LINE ISLANDS Christmas Island North Island New Ireland New Britain Guadalcanal Bougainville Guam Borneo New Guinea PAPUA NEW GUINEA AUSTRALIA INDONESIA PHILIPPINES CHINA Viti Vanua Stewart Island Okinawa New Caledonia Cook Islands American Samoa Wallis and Futuna Niue Coral Sea Islands BRUNEI S.A.R. Taiwan TIMOR-LESTE Hawaii Kauai Maui Kwajalein Ceva-i-Ra Banaba Bali Luzon Negros Yap RYUKU Kiritimati MARQUISES RAWAKI GILBERT ISLANDS Mindanao South Island CAROLINE ISLANDS Panay Buru Stewart Island Mariana Northern Islands Baker Island Howland Island Wake Island Jarvis Island Norfolk Island Pitcairn Islands NEW ZEALAND VANUATU FIJI TONGA MALAYSIA Macau NAURU PALAU FEDERATED STATES OF MICRONESIA Hong Kong S.A.R. French Polynesia Okino-tori-shima Rapa ARCHIPEL DES TUAMOTU Tasmania SANTA CRUZ ISLANDS Rotuma Levu Java Halmahera Minerva Reef SIMPSON DESERT GIBSON HAMMERSLEY GREAT VICTORIA GREAT SANDY Mount Kosciuszko Lake Eyre OCEANIA"
 copy-to-journal southeast_asia.pdf -t "Southeast Asia World Factbook Map (PDF)" -m "application/pdf" -d "Southeast Asia is a subregion of Asia, consisting of the countries that are geographically south of China, east of India and north of Australia. The region lies on the intersection of geological plates, with heavy seismic and volcanic activity. Southeast Asia consists of two geographic regions: the Asian mainland, and island arcs and archipelagoes to the east and southeast." -T "LAOS AUSTRALIA CHINA VIETNAM THAILAND BURMA INDIA MALAYSIA SINGAPORE BRUNEI PAPUA NEW GUINEA INDONESIA Ashmore and Cartier Islands TIMOR-LESTE Cocos Keeling Islands Macau S.A.R. FED. STATES OF MICRONESIA PALAU JAPAN Hong Kong S.A.R. Christmas Island PHILIPPINES CAMBODIA Taiwan Buru Borneo Bangka Billiton Sumatra Pulau Simeulue Pulau Nias Pulau Siberut Pratas Island Samar Mindoro Mindanao Negros Palawan Luzon Ceram PARACEL ISLANDS SPRATLY ISLANDS BABUYAN ISLANDS KEPULAUAN ISLANDS MENTAWAI Halmahera Pulau Sulawesi NICOBAR NAMPO SHOTO RYUKYU Okinawa Okino-tori-shima BONIN ISLANDS VOLCANO ISLANDS Timor Bali Madura Sumba Flores Sumbawa ANDAMAN ISLANDS Lombok KEPULAUAN ARU NATUNA Dao Hainan DAITO-SHOTO Java Panay MOLUCCAS SOUTHEAST ASIA New Guinea Davao Haiphong Ho Chi Minh City Pontianak Samarinda Palu Ambon Palembang Padang Medan Banda Aceh Phuket George Town Ipoh Kuching Semarang Bandung Surabaya Makassar Kupang Cebu Shanghai Hangzhou Changsha Guangzhou Nanning Chengdu Mandalay Pathein Mawlamyine Mai Da Nang Kunming Taipei Fuzhou Nanchang Guiyang Wuhan Long Xuyen Nha Trang Jayapura Sorong Manado Bacolod Hanoi Vientiane Rangoon Manila Bangkok Phnom Penh Bandar Seri Begawan Kuala Lumpur Singapore Jakarta Denpasar Nakhon Ratchasima Chiang Tanjungkarang Banjarmasin Zamboanga Cagayan de Oro Iloilo Naha Kao-hsiung Xiamen Chongqing Zigong Shantou Ningbo Wenzhou Zhanjiang Hefei Mount Isa Port Hedland Karratha Melekeok Hue Songkhla Dawei Vinh Kota Kinabalu Dili Kendari Merauke Melaka Akyab Nay Pyi Taw Telukbetung Darwin South China Sea East China Sea Java Sea Indian Ocean Arafura Sea Celebes Sea Sulu Sea Gulf of Tonkin Gulf of Thailand Coco Channel Great Channel Strait of Malacca Andaman Sea Philippine Sea North Pacific Ocean Timor Sea Banda Sea Taiwan Strait Mekong Irrawaddy Salween Brahmaputra Molucca Sea Flores Sea Makassar Strait Selat Sunda Jiang Xi Gulf of Carpentaria Luzon Strait Selat Karimata Selat Lombok Yangtze CHAÎNE ANNAMITIQUE BARISAN PEGUNUNGAN MAOKE GREAT SANDY DESERT HENGDUAN SHAN"
 
+# remove remaining stuff
 rm -f *.pdf
 
 EOF