Merge branch 'master' of github.com:/lunar-linux/moonbase-core

zmcgrew · Jul 8, 2012 · 2ed1aef · 2ed1aef
2 parents 128b39a + c6b70cc
commit 2ed1aef
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/crypto/openssl/POST_INSTALL b/crypto/openssl/POST_INSTALL
@@ -8,6 +8,8 @@ rm -rf /usr/lib/gcc-lib/*/$(installed_version gcc)/include/openssl &> /dev/null
 lunar fix wget
 
 # Recent openssl changes may break ssh undetectable to lunar fix
-lin -c openssh
+if module_installed openssh ; then
+  lin -c openssh
+fi
 
 lunar fix $(lvu depends openssl)
diff --git a/system/lunar/profile.d/lunar.rc b/system/lunar/profile.d/lunar.rc
@@ -116,7 +116,7 @@ _lunar_lvu()
   case "$prev" in
     -d|--debug|-v|--verbose|-h|--help)
       ;;
-    leafs|orphans|conflicts|alien|held|exiled|export|moonbase|html|updatelog|activity|pam|expired|new|newer|older|search|service)
+    leafs|orphans|conflicts|moonalyze|alien|held|exiled|export|moonbase|html|updatelog|activity|pam|expired|new|newer|older|search|service)
       # Do nothing because either the options don't take an argument or we can't do completion
       return 0
       ;;
@@ -152,7 +152,7 @@ _lunar_lvu()
                                what where cd alien from leafs orphans conflicts search service website install size installed compile \
                                compiler links sources maintainer version sum md5sum export import section moonbase html updatelog \
                                activity newer older voyeur pam expired depends tree eert stree leert held exiled urls versions short \
-                               info edit unedit diff new submit' -- "$cur" ) )
+                               info edit unedit diff new submit moonalyze' -- "$cur" ) )
   fi
 
   return 0